cloudstack/server
Likitha Shetty f03dcdab19 [CLOUDSTACK-5051] Revert "CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes."
This reverts commit 3a91500173.

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java
2013-11-06 19:07:33 +05:30
..
conf Summary: Updated sudoers approved commands for cloud user 2013-10-23 13:42:16 -07:00
resources Move LockMasterListener initialization to system context 2013-10-25 15:11:47 -07:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src [CLOUDSTACK-5051] Revert "CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes." 2013-11-06 19:07:33 +05:30
test Added an api call to import all the ldap users to the same domains(ou's) in cloudstack 2013-10-29 09:04:33 +00:00
pom.xml Get rid of some errors and warnings in the server and usage sources 2013-11-04 20:01:14 +01:00