Updated Branches: refs/heads/master a572e5941 -> 6949b40c9
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/6949b40c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6949b40c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6949b40c Branch: refs/heads/master Commit: 6949b40c94feb0103ec6a72818e00cccc98c2c41 Parents: a19c962 a572e59 Author: Pranav Saxena <[email protected]> Authored: Tue Sep 11 21:32:35 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Sep 11 21:32:35 2012 +0530 ---------------------------------------------------------------------- api/src/com/cloud/api/ApiConstants.java | 1 + .../cloud/api/commands/CreateDiskOfferingCmd.java | 11 ++- api/src/com/cloud/api/commands/CreateZoneCmd.java | 13 +++- api/src/com/cloud/api/commands/DeployVMCmd.java | 14 +++- api/src/com/cloud/api/commands/UpdateZoneCmd.java | 10 ++- .../cloud/api/response/DiskOfferingResponse.java | 10 ++ api/src/com/cloud/api/response/ZoneResponse.java | 7 ++ api/src/com/cloud/dc/DataCenter.java | 1 + .../WEB-INF/classes/resources/messages.properties | 1 + .../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 2 +- cloud.spec | 5 + console-proxy/pom.xml | 4 +- debian/cloud-agent.conffiles | 2 - debian/cloud-client.conffiles | 3 - debian/cloud-deps.install | 5 +- debian/control | 4 +- server/src/com/cloud/api/ApiResponseHelper.java | 21 +---- server/src/com/cloud/configuration/Config.java | 1 - .../cloud/configuration/ConfigurationManager.java | 4 +- .../configuration/ConfigurationManagerImpl.java | 26 +++++- server/src/com/cloud/dc/DataCenterVO.java | 26 ++++-- .../cloud/storage/LocalStoragePoolListener.java | 10 ++- .../src/com/cloud/storage/StorageManagerImpl.java | 64 +++++++++----- .../allocator/AbstractStoragePoolAllocator.java | 4 +- .../allocator/FirstFitStoragePoolAllocator.java | 10 ++- .../allocator/LocalStoragePoolAllocator.java | 40 ++++++--- .../storage/allocator/StoragePoolAllocator.java | 2 +- .../allocator/UseLocalForRootAllocator.java | 17 ++-- server/src/com/cloud/test/DatabaseConfig.java | 5 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 69 ++++++++++----- setup/db/create-schema.sql | 1 + setup/db/db/schema-302to40.sql | 4 + ui/scripts/configuration.js | 13 +++- ui/scripts/storage.js | 10 +-- ui/scripts/system.js | 11 +++ wscript_configure | 4 +- 36 files changed, 299 insertions(+), 136 deletions(-) ----------------------------------------------------------------------
