Merge branch 'master' into entity
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/485bcf26 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/485bcf26 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/485bcf26 Branch: refs/heads/api_entity Commit: 485bcf26a2da524a2498db11cec878445c9dcd81 Parents: e8b2aaf 6cb1486 Author: Min Chen <[email protected]> Authored: Wed Mar 20 15:55:39 2013 -0700 Committer: Min Chen <[email protected]> Committed: Wed Mar 20 15:55:39 2013 -0700 ---------------------------------------------------------------------- client/pom.xml | 21 +- client/tomcatconf/componentContext.xml.in | 32 ++- client/tomcatconf/nonossComponentContext.xml.in | 18 +- developer/pom.xml | 240 +++++++++------ docs/en-US/changed-apicommands-4.1.xml | 25 +- docs/en-US/ipv6-support.xml | 10 +- .../subsystem/api/storage/AbstractScope.java | 30 ++ .../engine/subsystem/api/storage/ClusterScope.java | 2 +- .../engine/subsystem/api/storage/HostScope.java | 2 +- .../engine/subsystem/api/storage/Scope.java | 1 + .../engine/subsystem/api/storage/ZoneScope.java | 2 +- .../engine/subsystem/api/storage/ScopeTest.java | 59 ++++ .../storage/datastore/DefaultPrimaryDataStore.java | 11 + .../resource/SimulatorSecondaryDiscoverer.java | 2 +- pom.xml | 113 +------- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 + .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 13 + server/src/com/cloud/network/NetworkModelImpl.java | 5 + .../src/com/cloud/network/NetworkServiceImpl.java | 5 + .../src/com/cloud/server/ManagementServerImpl.java | 23 +- server/src/com/cloud/server/StatsCollector.java | 12 + .../src/com/cloud/storage/VolumeManagerImpl.java | 75 ++---- server/src/com/cloud/user/AccountManagerImpl.java | 11 +- setup/db/db/schema-40to410.sql | 3 +- test/integration/component/test_project_usage.py | 2 +- test/integration/component/test_usage.py | 2 +- test/integration/component/test_volumes.py | 2 +- test/integration/smoke/test_iso.py | 4 +- test/integration/smoke/test_nic.py | 2 +- test/integration/smoke/test_vm_life_cycle.py | 2 +- tools/apidoc/gen_toc.py | 1 + tools/cli/cloudmonkey/cachemaker.py | 6 +- tools/cli/cloudmonkey/cloudmonkey.py | 3 +- .../marvin/sandbox/demo/simulator/simulator.cfg | 4 +- tools/marvin/pom.xml | 219 +++++++------- ui/scripts/cloud.core.callbacks.js | 25 ++- ui/scripts/cloudStack.js | 9 +- ui/scripts/regions.js | 55 +++- ui/scripts/sharedFunctions.js | 1 + ui/scripts/ui-custom/regions.js | 23 +- utils/src/com/cloud/utils/net/NetUtils.java | 2 +- 41 files changed, 605 insertions(+), 474 deletions(-) ----------------------------------------------------------------------
