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 <[email protected]> Authored: Mon Aug 26 15:34:52 2013 -0600 Committer: Mike Tutkowski <[email protected]> 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(-) ----------------------------------------------------------------------
