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 4F4FF17752 for ; Thu, 16 Oct 2014 13:25:56 +0000 (UTC) Received: (qmail 66027 invoked by uid 500); 16 Oct 2014 13:25:35 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 65935 invoked by uid 500); 16 Oct 2014 13:25:35 -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 65367 invoked by uid 99); 16 Oct 2014 13:25:34 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 13:25:34 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A8D4D9ADF43; Thu, 16 Oct 2014 13:25:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Thu, 16 Oct 2014 13:26:08 -0000 Message-Id: <1a238f4b35d9463ea77b5d2eafba6c67@git.apache.org> In-Reply-To: <613e1faf1a374433b2613446fb63a1e7@git.apache.org> References: <613e1faf1a374433b2613446fb63a1e7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] git commit: updated refs/heads/master to 7072d8d CLOUDSTACK-7723: UI > Storage > detail view > add Disk Offering field. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26f3e849 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26f3e849 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26f3e849 Branch: refs/heads/master Commit: 26f3e8499a6889e00b6e2ea63a0a9425c1b2647e Parents: e7fa3a2 Author: Jessica Wang Authored: Tue Oct 14 14:17:39 2014 -0700 Committer: Jessica Wang Committed: Tue Oct 14 14:17:39 2014 -0700 ---------------------------------------------------------------------- ui/scripts/storage.js | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26f3e849/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 97b3b8f..ee8fa9d 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1458,6 +1458,9 @@ status: { label: 'label.status' }, + diskofferingdisplaytext: { + label: 'Disk Offering' + }, type: { label: 'label.type' },