cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject git commit: updated refs/heads/4.3 to f29c718
Date Thu, 14 Nov 2013 23:47:19 GMT
Updated Branches:
  refs/heads/4.3 b27de95d7 -> f29c7188b


CLOUDSTACK-5176:
Added the cluster scope to vmware.reserve factors
Signed off by : nitin mehta<nitin.mehta@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f29c7188
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f29c7188
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f29c7188

Branch: refs/heads/4.3
Commit: f29c7188ba03f1997238d50f8a11857e94fe4b55
Parents: b27de95
Author: Nitin Mehta <nitin.mehta@citrix.com>
Authored: Thu Nov 14 15:19:49 2013 -0800
Committer: Nitin Mehta <nitin.mehta@citrix.com>
Committed: Thu Nov 14 15:47:09 2013 -0800

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f29c7188/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index bc805b7..9f4fc95 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -258,8 +258,8 @@ public enum Config {
     VmwareAdditionalVncPortRangeStart("Advanced", ManagementServer.class, Integer.class,
"vmware.additional.vnc.portrange.start", "50000", "Start port number of additional VNC port
range", null),
     VmwareAdditionalVncPortRangeSize("Advanced", ManagementServer.class, Integer.class, "vmware.additional.vnc.portrange.size",
"1000", "Start port number of additional VNC port range", null),
     //VmwareGuestNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.guest.nic.device.type",
"E1000", "Ethernet card type used in guest VM, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3",
null),
-    VmwareReserveCpu("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.cpu",
"false", "Specify whether or not to reserve CPU based on CPU overprovisioning factor", null),
-    VmwareReserveMem("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.mem",
"false", "Specify whether or not to reserve memory based on memory overprovisioning factor",
null),
+    VmwareReserveCpu("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.cpu",
"false", "Specify whether or not to reserve CPU based on CPU overprovisioning factor", null,
ConfigurationParameterScope.cluster.toString()),
+    VmwareReserveMem("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.mem",
"false", "Specify whether or not to reserve memory based on memory overprovisioning factor",
null, ConfigurationParameterScope.cluster.toString()),
     VmwareRootDiskControllerType("Advanced", ManagementServer.class, String.class, "vmware.root.disk.controller",
"ide", "Specify the default disk controller for root volumes, valid values are scsi, ide",
null),
     VmwareSystemVmNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.systemvm.nic.device.type",
"E1000", "Specify the default network device type for system VMs, valid values are E1000,
PCNet32, Vmxnet2, Vmxnet3", null),
     VmwareRecycleHungWorker("Advanced", ManagementServer.class, Boolean.class, "vmware.recycle.hung.wokervm",
"false", "Specify whether or not to recycle hung worker VMs", null),


Mime
View raw message