Bharat Kumar 99b4cf788e 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:39:10 +05:30
..
bindir	CLOUDSTACK-6271: The cloud-setup-databases was failing when your jasypt jar path has spaces in it's path	2014-04-29 14:44:03 +05:30
db	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:39:10 +05:30
dev	CLOUDSTACk-5674: Added fix for CLOUDSTACK-5674	2014-02-12 17:34:34 +05:30