Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0333225e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0333225e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0333225e Branch: refs/heads/cloud-agent-with-openvswitch Commit: 0333225e22e092a30cd87ff6077358d871726b36 Parents: 5a86546 a5ac88d Author: Min Chen <[email protected]> Authored: Fri Jan 18 11:14:48 2013 -0800 Committer: Min Chen <[email protected]> Committed: Fri Jan 18 11:14:48 2013 -0800 ---------------------------------------------------------------------- .../config/opt/cloud/bin/checkbatchs2svpn.sh | 25 +++++ ui/index.jsp | 2 +- ui/scripts/instanceWizard.js | 83 ++++++++------- ui/scripts/ui-custom/instanceWizard.js | 19 +++- 4 files changed, 87 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
