Min Chen 613a061977 Merge branch 'master' into vim51_win8 ... Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java		2013-03-04 17:32:52 -08:00
..
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	Merge branch 'master' into vim51_win8	2013-03-04 17:32:52 -08:00
network	CLOUDSTACK-657 VMware vNetwork Distributed Virtual Switch support in CloudStack	2013-02-27 18:37:14 +05:30
storage/resource	Upgrade to use Vsphere 5.1 SDK jar, fixed all compilation error with new	2013-02-04 17:41:36 -08:00