Bharat Kumar 489bb0c7ed Cloudstack-5077: reserve cpu and memory only when vmware.reserve.cpu/mem are set to true. Insted of setting the ovecommit values to one on upgrade, we popultate them from the global values. ... Conflicts: engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java engine/schema/src/com/cloud/upgrade/dao/Upgrade420to421.java plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java		2014-05-05 11:32:51 +05:30
..
com/cloud	Cloudstack-5077: reserve cpu and memory only when vmware.reserve.cpu/mem are set to true. Insted of setting the ovecommit values to one on upgrade, we popultate them from the global values.	2014-05-05 11:32:51 +05:30
org/apache/cloudstack	CLOUDSTACK-6170	2014-03-05 13:55:12 -07:00