You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/01/27 14:41:03 UTC
[16/17] git commit: Merge branch 'master' into javelin
Merge branch 'master' into javelin
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2fb346ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2fb346ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2fb346ab
Branch: refs/heads/javelin
Commit: 2fb346ab629dae053121713849d6ebe439a596d5
Parents: a4c778e 7d40a7e
Author: Rohit Yadav <bh...@apache.org>
Authored: Sun Jan 27 05:20:49 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Sun Jan 27 05:20:49 2013 -0800
----------------------------------------------------------------------
console-proxy/pom.xml | 18 ++-
docs/en-US/offerings.xml | 32 ++--
docs/en-US/sys-offering-sysvm.xml | 75 ++++++
setup/db/create-schema.sql | 1 +
setup/db/db/schema-40to410.sql | 2 +
tools/cli/cloudmonkey/cachegen.py | 11 +-
tools/cli/cloudmonkey/cloudmonkey.py | 45 ++--
tools/cli/cloudmonkey/common.py | 9 -
ui/scripts/accounts.js | 8 +-
ui/scripts/system.js | 7 +
ui/scripts/ui-custom/instanceWizard.js | 15 +-
ui/scripts/ui/dialog.js | 335 +++++++++++++++------------
12 files changed, 347 insertions(+), 211 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2fb346ab/setup/db/create-schema.sql
----------------------------------------------------------------------