Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B17A17B36 for ; Tue, 4 Nov 2014 20:53:55 +0000 (UTC) Received: (qmail 6174 invoked by uid 500); 4 Nov 2014 20:53:55 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 5515 invoked by uid 500); 4 Nov 2014 20:53:54 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 5456 invoked by uid 99); 4 Nov 2014 20:53:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 20:53:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 23E848AEBAE; Tue, 4 Nov 2014 20:36:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Message-Id: <47699a7b3c004f19911f115c56ce88eb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to fad6c75 Date: Tue, 4 Nov 2014 20:36:33 +0000 (UTC) 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 Authored: Tue Nov 4 11:42:15 2014 +0000 Committer: Brian Federle 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')