Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fd2ae034 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fd2ae034 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fd2ae034 Branch: refs/heads/master Commit: fd2ae034f5cecf8834d99b98053970c5594023e8 Parents: 58648c4 60a8e88 Author: Pranav Saxena <[email protected]> Authored: Thu May 2 02:59:36 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Thu May 2 02:59:36 2013 +0530 ---------------------------------------------------------------------- ui/scripts/instanceWizard.js | 10 ++- ui/scripts/system.js | 129 ++++++--------------------- ui/scripts/ui-custom/instanceWizard.js | 30 ++++-- 3 files changed, 58 insertions(+), 111 deletions(-) ----------------------------------------------------------------------
