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
..
api	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
ha	Removed the getByTypeAndId() method and replace it with getById method	2013-07-22 20:06:04 -07:00
hypervisor	[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
network	Refactor missed classes	2013-10-17 16:00:11 -07:00
storage/resource	[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