Bharat Kumar f701831713 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>		2013-08-27 19:42:07 +05:30
..
conf	conf: Add a @ so @MSUSER@ is replaced by "cloud"	2013-04-03 16:54:00 +02:00
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	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 19:42:07 +05:30
test	CLOUDSTACK-4442: Source NAT not applied when network starts up	2013-08-22 18:45:33 +05:30
pom.xml	Added the git commit and branch to war file	2013-07-11 17:37:36 -07:00