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 D2595105CD for ; Mon, 26 Aug 2013 21:38:48 +0000 (UTC) Received: (qmail 88151 invoked by uid 500); 26 Aug 2013 21:38:48 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 88127 invoked by uid 500); 26 Aug 2013 21:38:48 -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 88120 invoked by uid 99); 26 Aug 2013 21:38:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 21:38:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 63F8B8C5DA1; Mon, 26 Aug 2013 21:38:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mtutkowski@apache.org To: commits@cloudstack.apache.org Date: Mon, 26 Aug 2013 21:38:49 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.2-forward to 6a2f15f Merge remote-tracking branch 'upstream/4.2-forward' into 4.2-forward Make Mutual CHAP optional. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a2f15f9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a2f15f9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a2f15f9 Branch: refs/heads/4.2-forward Commit: 6a2f15f94ae74b563a2d4df6da38e7f6ff44c8ac Parents: 13a415f ae68c84 Author: Mike Tutkowski Authored: Mon Aug 26 15:34:52 2013 -0600 Committer: Mike Tutkowski Committed: Mon Aug 26 15:34:52 2013 -0600 ---------------------------------------------------------------------- ui/scripts/ui-custom/zoneWizard.js | 57 +++++++++++++++++++++++++++------ ui/scripts/zoneWizard.js | 29 ++++++++++++++++- 2 files changed, 76 insertions(+), 10 deletions(-) ----------------------------------------------------------------------