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 2012/07/06 19:27:30 UTC

git commit: CS-15388: Fix labels

Updated Branches:
  refs/heads/master 54203f08a -> 093af8a6a


CS-15388: Fix labels

Labels for CPU/Mem (as found in compute offering window) are missing
the required values for CPU and RAM

Original patch by: Pranav Saxena <pr...@citrix.com>
reviewed-by: Brian Federle <br...@citrix.com>


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

Branch: refs/heads/master
Commit: 093af8a6a90b63de16ad8f048a5d24094d57fdb4
Parents: 54203f0
Author: Brian Federle <br...@citrix.com>
Authored: Fri Jul 6 10:25:01 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Jul 6 10:27:09 2012 -0700

----------------------------------------------------------------------
 .../WEB-INF/classes/resources/messages.properties  |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/093af8a6/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 52e6900..35fe568 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -7,8 +7,8 @@ message.action.disable.physical.network=Please confirm that you want to disable
 
 
 #modified labels (begin) *****************************************************************************************
-
-
+label.memory.mb=Memory (in MB)
+label.cpu.mhz=CPU (in MHz)
 #modified labels (end) *******************************************************************************************
 
 
@@ -903,7 +903,6 @@ label.code=Code
 label.confirmation=Confirmation
 label.cpu.allocated.for.VMs=CPU Allocated for VMs
 label.cpu.allocated=CPU Allocated
-label.cpu.mhz=CPU 
 label.cpu.utilized=CPU Utilized
 label.cpu=CPU
 label.created=Created
@@ -1023,7 +1022,6 @@ label.lun=LUN
 label.manage=Manage
 label.maximum=Maximum
 label.memory.allocated=Memory Allocated
-label.memory.mb=Memory
 label.memory.total=Memory Total
 label.memory.used=Memory Used
 label.memory=Memory