You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/12/21 21:53:31 UTC
[1/9] git commit: Merge branch 'master' into ui-plugins
Updated Branches:
refs/heads/ui-plugins da8f0be2e -> 0e3184cdc
Merge branch 'master' into ui-plugins
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0e3184cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0e3184cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0e3184cd
Branch: refs/heads/ui-plugins
Commit: 0e3184cdcc85d156638d408b21dbe57379107d6b
Parents: da8f0be 67f9467
Author: Brian Federle <br...@citrix.com>
Authored: Fri Dec 21 12:53:10 2012 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Dec 21 12:53:10 2012 -0800
----------------------------------------------------------------------
LICENSE | 3474 +++++++--------
NOTICE | 146 +-
server/src/com/cloud/configuration/Config.java | 3 +
.../router/VirtualNetworkApplianceManagerImpl.java | 39 +-
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 10 +-
setup/db/create-schema.sql | 2 +-
setup/db/db/schema-40to41.sql | 23 -
setup/db/db/schema-40to410.sql | 4 +
tools/cli/cloudmonkey/cloudmonkey.py | 68 +-
tools/cli/cloudmonkey/common.py | 1 +
tools/cli/setup.py | 4 +-
tools/whisker/descriptor.xml | 43 +-
12 files changed, 1931 insertions(+), 1886 deletions(-)
----------------------------------------------------------------------