Merge branch 'maven-final' of git://github.com/ibuildthecloud/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/f2180036 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f2180036 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f2180036 Branch: refs/heads/master Commit: f218003607bcdfa97769331e6b8519fa9cf78536 Parents: 8c3450b ff7c964 Author: olivier lamy <[email protected]> Authored: Tue Aug 28 23:30:57 2012 +0200 Committer: olivier lamy <[email protected]> Committed: Tue Aug 28 23:30:57 2012 +0200 ---------------------------------------------------------------------- awsapi/pom.xml | 8 + client/WEB-INF/web.xml | 6 - client/cloudstack-ui.launch | 14 + client/pom.xml | 235 +++++++++++++++ console-proxy/pom.xml | 8 + deps/install-non-oss.sh | 10 + m2-settings.xml | 59 ---- plugins/pom.xml | 76 +++++- plugins/storage-allocators/random/pom.xml | 2 +- pom.xml | 20 +- server/pom.xml | 10 +- server/src/com/cloud/maint/Version.java | 8 + .../src/com/cloud/server/ManagementServerImpl.java | 2 +- .../cloud/upgrade/DatabaseIntegrityChecker.java | 4 + .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 + utils/pom.xml | 22 ++- utils/src/com/cloud/utils/script/Script.java | 6 + 17 files changed, 398 insertions(+), 95 deletions(-) ----------------------------------------------------------------------
