Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D497D319 for ; Thu, 9 Aug 2012 23:15:58 +0000 (UTC) Received: (qmail 34510 invoked by uid 500); 9 Aug 2012 23:15:57 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 34484 invoked by uid 500); 9 Aug 2012 23:15:57 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 34467 invoked by uid 99); 9 Aug 2012 23:15:57 -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, 09 Aug 2012 23:15:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9D5793CEB8; Thu, 9 Aug 2012 23:15:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: VPC UI, VPN connections: fix 'DPD' boolean field Message-Id: <20120809231557.9D5793CEB8@tyr.zones.apache.org> Date: Thu, 9 Aug 2012 23:15:57 +0000 (UTC) VPC UI, VPN connections: fix 'DPD' boolean field Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/241d83aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/241d83aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/241d83aa Branch: refs/heads/vpc Commit: 241d83aa09bd15e74aade64de9a2cadf3a5d64ba Parents: 41afde3 Author: Brian Federle Authored: Thu Aug 9 16:13:04 2012 -0700 Committer: Brian Federle Committed: Thu Aug 9 16:15:29 2012 -0700 ---------------------------------------------------------------------- ui/scripts/vpc.js | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/241d83aa/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 064e073..1529542 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -1039,7 +1039,12 @@ esppolicy: { label: 'ESP policy' }, ikelifetime: { label: 'IKE Lifetime (second)' }, esplifetime: {label: 'ESP Lifetime(second)' }, - // dpd: {label: 'Dead Peer Detection'}, + dpd: { + label: 'Dead Peer Detection', + converter: function(str) { + return str ? 'Yes' : 'No'; + } + }, state: {label: 'State' }, created: { label: 'label.date', converter: cloudStack.converters.toLocalDate } }