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/2c9e3144 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2c9e3144 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2c9e3144 Branch: refs/heads/ui-plugins Commit: 2c9e314477de7cf6b263773b34a957b06a6871ef Parents: 4ccbdbd 8f11f63 Author: Min Chen <[email protected]> Authored: Fri Jan 25 14:15:22 2013 -0800 Committer: Min Chen <[email protected]> Committed: Fri Jan 25 14:15:22 2013 -0800 ---------------------------------------------------------------------- docs/en-US/offerings.xml | 32 +++++------ docs/en-US/sys-offering-sysvm.xml | 75 +++++++++++++++++++++++++++ ui/scripts/accounts.js | 8 ++- ui/scripts/system.js | 7 +++ ui/scripts/ui-custom/instanceWizard.js | 15 +++++- 5 files changed, 116 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
