You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/07/26 21:02:56 UTC
[1/2] git commit: updated refs/heads/4.2 to ec11eba
Updated Branches:
refs/heads/4.2 af7587b98 -> ec11eba29
refs/heads/master 0f7870332 -> bba79b6b4
CLOUDSTACK-3710: Remove remaining overcommit fields from cluster UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec11eba2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec11eba2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec11eba2
Branch: refs/heads/4.2
Commit: ec11eba293c06d861b5cfb0aeeeeb99e7527eaf2
Parents: af7587b
Author: Brian Federle <br...@citrix.com>
Authored: Fri Jul 26 12:02:00 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Jul 26 12:02:26 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 30 ------------------------------
1 file changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec11eba2/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4e94b2e..cbed773 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10839,19 +10839,6 @@
}
},
- cpuovercommit: {
- label: 'CPU overcommit ratio',
- defaultValue: '1'
-
- },
-
- memoryovercommit: {
- label: 'RAM overcommit ratio',
- defaultValue: '1'
-
- },
-
-
isDedicated: {
label: 'Dedicate',
isBoolean: true,
@@ -11132,15 +11119,6 @@
var clusterName = args.data.name;
- if (args.data.cpuovercommit != "" && args.data.cpuovercommit > 0) {
-
- array1.push("&cpuovercommitratio=" + todb(args.data.cpuovercommit));
-
- }
-
- if (args.data.memoryovercommit != "" && args.data.memoryovercommit > 0)
- array1.push("&memoryovercommitratio=" + todb(args.data.memoryovercommit));
-
if (args.data.hypervisor == "VMware") {
array1.push("&username=" + todb(args.data.vCenterUsername));
array1.push("&password=" + todb(args.data.vCenterPassword));
@@ -11611,14 +11589,6 @@
clustertype: {
label: 'label.cluster.type'
},
- cpuovercommitratio: {
- label: 'CPU overcommit Ratio',
- isEditable: true
- },
- memoryovercommitratio: {
- label: 'Memory overcommit Ratio',
- isEditable: true
- },
//allocationstate: { label: 'label.allocation.state' },
//managedstate: { label: 'Managed State' },
state: {
[2/2] git commit: updated refs/heads/master to bba79b6
Posted by bf...@apache.org.
CLOUDSTACK-3710: Remove remaining overcommit fields from cluster UI
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bba79b6b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bba79b6b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bba79b6b
Branch: refs/heads/master
Commit: bba79b6b4e20d67ee17259005853a3c1a59cea6b
Parents: 0f78703
Author: Brian Federle <br...@citrix.com>
Authored: Fri Jul 26 12:02:00 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Jul 26 12:02:49 2013 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 30 ------------------------------
1 file changed, 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bba79b6b/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4e94b2e..cbed773 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -10839,19 +10839,6 @@
}
},
- cpuovercommit: {
- label: 'CPU overcommit ratio',
- defaultValue: '1'
-
- },
-
- memoryovercommit: {
- label: 'RAM overcommit ratio',
- defaultValue: '1'
-
- },
-
-
isDedicated: {
label: 'Dedicate',
isBoolean: true,
@@ -11132,15 +11119,6 @@
var clusterName = args.data.name;
- if (args.data.cpuovercommit != "" && args.data.cpuovercommit > 0) {
-
- array1.push("&cpuovercommitratio=" + todb(args.data.cpuovercommit));
-
- }
-
- if (args.data.memoryovercommit != "" && args.data.memoryovercommit > 0)
- array1.push("&memoryovercommitratio=" + todb(args.data.memoryovercommit));
-
if (args.data.hypervisor == "VMware") {
array1.push("&username=" + todb(args.data.vCenterUsername));
array1.push("&password=" + todb(args.data.vCenterPassword));
@@ -11611,14 +11589,6 @@
clustertype: {
label: 'label.cluster.type'
},
- cpuovercommitratio: {
- label: 'CPU overcommit Ratio',
- isEditable: true
- },
- memoryovercommitratio: {
- label: 'Memory overcommit Ratio',
- isEditable: true
- },
//allocationstate: { label: 'label.allocation.state' },
//managedstate: { label: 'Managed State' },
state: {