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 2014/11/04 21:36:33 UTC
git commit: updated refs/heads/master to fad6c75
Repository: cloudstack
Updated Branches:
refs/heads/master 2a1793283 -> fad6c7514
CLOUDSTACK-7838: UI - Update category names on Resources tab of a Zone -Changed wording: "Storage" -> "Primary Storage Used", "CPU" -> "CPU allocated", Memory -> "Memory Allocated"
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fad6c751
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fad6c751
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fad6c751
Branch: refs/heads/master
Commit: fad6c7514f23b3785818771cd1d3e626af7274b9
Parents: 2a17932
Author: Gabor Apati-Nagy <ga...@citrix.com>
Authored: Tue Nov 4 11:42:15 2014 +0000
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Nov 4 12:31:24 2014 -0800
----------------------------------------------------------------------
ui/scripts/ui-custom/zoneChart.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fad6c751/ui/scripts/ui-custom/zoneChart.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneChart.js b/ui/scripts/ui-custom/zoneChart.js
index ac3c0e4..989c4c2 100644
--- a/ui/scripts/ui-custom/zoneChart.js
+++ b/ui/scripts/ui-custom/zoneChart.js
@@ -355,13 +355,13 @@
var chartItems = {
// The keys are based on the internal type ID associated with each capacity
0: {
- name: _l('label.memory')
+ name: _l('label.memory.allocated')
},
1: {
- name: _l('label.cpu')
+ name: _l('label.cpu.allocated')
},
2: {
- name: _l('label.storage')
+ name: _l('label.primary.used')
},
3: {
name: _l('label.primary.allocated')