Likitha Shetty 9a8dddac2f 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 0a1012817a.		2013-11-06 20:05:14 +05:30
..
api	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
ha	Improve component lifecycle management with system run-level concept	2013-01-30 15:21:02 -08:00
hypervisor	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 20:05:14 +05:30
network	CLOUDSTACK-3905 [VMWARE]Can not add Standard/DVSwitch when Nexus global config is set to true	2013-08-12 22:41:38 +05:30
storage/resource	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 20:05:14 +05:30