Bharat Kumar fa6da31e15 CLOUDSTACK-4498 we should not reserve memory and cpu for vmware VMs if the vmware.reserve.cpu and vmware.reserve.mem are set to false. ... Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java Signed-off-by: Jayapal <jayapal@apache.org> (cherry picked from commit f701831713) Signed-off-by: animesh <animesh@apache.org>		2013-08-27 12:55:14 -07:00
..
acl/static-role-based	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
affinity-group-processors	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
alert-handlers	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
api	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
dedicated-resources	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
deployment-planners	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
event-bus/rabbitmq	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
file-systems/netapp	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
host-allocators/random	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
hypervisors	CLOUDSTACK-4498 we should not reserve memory and cpu for vmware VMs if the vmware.reserve.cpu and vmware.reserve.mem are set to false.	2013-08-27 12:55:14 -07:00
network-elements	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
storage	Merge branch '4.2-forward' into 4.2	2013-08-26 16:18:12 -07:00
storage-allocators/random	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
user-authenticators	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00
pom.xml	Updating pom.xml version numbers for release 4.2.0	2013-08-22 17:15:42 -07:00