Merge branch 'master' into marvin-refactor-phase1
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cadf327b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cadf327b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cadf327b Branch: refs/heads/marvin-refactor Commit: cadf327b2528248c3104228df45e7db86201d3c5 Parents: 2b7f86c 25c0d84 Author: Prasanna Santhanam <[email protected]> Authored: Sat Jan 26 18:41:32 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sat Jan 26 18:41:32 2013 +0530 ---------------------------------------------------------------------- .../api/command/user/iso/AttachIsoCmd.java | 2 +- .../api/command/user/iso/DetachIsoCmd.java | 2 +- docs/en-US/offerings.xml | 32 +++---- docs/en-US/sys-offering-sysvm.xml | 75 +++++++++++++++ tools/cli/cloudmonkey/cloudmonkey.py | 33 +++++-- ui/scripts/instanceWizard.js | 33 ++++++- ui/scripts/ui-custom/instanceWizard.js | 10 ++ 7 files changed, 155 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
