Min Chen 93f14e7c65 Merge branch 'master' into vim51_win8 ... Conflicts: client/tomcatconf/componentContext.xml.in plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java vmware-base/test/com/cloud/vmware/TestVMWare.java		2013-02-27 17:47:10 -08:00
..
baremetal	Cloudstack-711: Cpu and Ram Overcommit Ratio.	2013-02-22 17:31:06 +05:30
kvm	CLOUDSTACK-1410: Add a Unit test to verify if it actually works.	2013-02-27 17:34:06 +01:00
ovm	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
simulator	Cloudstack-711: Cpu and Ram Overcommit Ratio.	2013-02-22 17:31:06 +05:30
ucs	fix adding nfs primary storage and build and load	2013-02-21 16:24:39 -08:00
vmware	Merge branch 'master' into vim51_win8	2013-02-27 17:47:10 -08:00
xen	CLOUDSTACK-724: add zone wide storage, createstoragepoolcmd doesn't need cluster/pod any more	2013-02-26 23:16:17 -08:00