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 20237104F0 for ; Sat, 15 Jun 2013 02:52:15 +0000 (UTC) Received: (qmail 26053 invoked by uid 500); 15 Jun 2013 02:52:06 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 25861 invoked by uid 500); 15 Jun 2013 02:52:05 -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 25511 invoked by uid 99); 15 Jun 2013 02:52:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jun 2013 02:52:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 28C71881D75; Sat, 15 Jun 2013 02:52:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Date: Sat, 15 Jun 2013 02:52:30 -0000 Message-Id: <0fb0071e221f47dd9e34ad0454a6750e@git.apache.org> In-Reply-To: <945ac104d1e84e229519e8382bd02b4d@git.apache.org> References: <945ac104d1e84e229519e8382bd02b4d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] git commit: updated refs/heads/object_store to f41c800 CLOUDSTACK-2360: UI - Infrastructure menu - zone detail - physical network - network service providers - Netscaler - view devices - device detail page - add GSLB Provider enabled or not, GSLB Provider Public IP, GSLB Provider Private IP field. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/26306252 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/26306252 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/26306252 Branch: refs/heads/object_store Commit: 26306252604ff3fcfbdd3fb3a4a44180359de50d Parents: bf73d75 Author: Jessica Wang Authored: Thu Jun 13 14:58:32 2013 -0700 Committer: Jessica Wang Committed: Thu Jun 13 15:03:04 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26306252/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index f37f602..df37f31 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7899,7 +7899,13 @@ lbdevicededicated: { label: 'label.dedicated', converter: cloudStack.converters.toBooleanText - } + }, + gslbprovider: { + label: 'GSLB service', + converter: cloudStack.converters.toBooleanText + }, + gslbproviderpublicip: { label: 'GSLB service Public IP' }, + gslbproviderprivateip: { label: 'GSLB service Private IP' } } ], dataProvider: function(args) {