You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/07/27 23:01:32 UTC
[26/50] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
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/b037f274
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b037f274
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b037f274
Branch: refs/heads/vpc
Commit: b037f2749d8441a7c4721a64c3c2d1f1da6070c6
Parents: ff71dd0 7d406bf
Author: chip.childers@gmail.com <ch...@gmail.com>
Authored: Thu Jul 26 21:21:50 2012 -0400
Committer: chip.childers@gmail.com <ch...@gmail.com>
Committed: Thu Jul 26 21:21:50 2012 -0400
----------------------------------------------------------------------
.../computing/LibvirtComputingResource.java | 80 ++++-
.../agent/resource/computing/LibvirtSecretDef.java | 106 ++++++
.../resource/computing/LibvirtStoragePoolDef.java | 80 +++++-
.../computing/LibvirtStoragePoolXMLParser.java | 35 ++-
.../agent/resource/computing/LibvirtVMDef.java | 66 ++++-
.../com/cloud/agent/storage/KVMPhysicalDisk.java | 16 +
.../com/cloud/agent/storage/KVMStoragePool.java | 10 +
.../cloud/agent/storage/KVMStoragePoolManager.java | 21 +-
.../cloud/agent/storage/LibvirtStorageAdaptor.java | 254 +++++++++++++--
.../cloud/agent/storage/LibvirtStoragePool.java | 50 +++
.../com/cloud/agent/storage/StorageAdaptor.java | 4 +-
api/src/com/cloud/agent/api/to/StorageFilerTO.java | 6 +
.../cloud/api/commands/CreateFirewallRuleCmd.java | 2 +-
api/src/com/cloud/storage/Storage.java | 1 +
api/src/com/cloud/storage/StoragePool.java | 5 +
core/src/com/cloud/storage/StoragePoolVO.java | 22 ++
.../hypervisor/vmware/resource/VmwareResource.java | 14 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 43 +++-
.../com/cloud/network/rules/RulesManagerImpl.java | 3 +
server/src/com/cloud/storage/StorageManager.java | 4 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 108 ++++++-
.../allocator/AbstractStoragePoolAllocator.java | 77 +----
.../allocator/FirstFitStoragePoolAllocator.java | 13 +
.../storage/snapshot/SnapshotManagerImpl.java | 8 +
setup/db/create-schema.sql | 1 +
setup/db/db/schema-303to40.sql | 22 ++
ui/index.jsp | 1 +
ui/scripts/sharedFunctions.js | 25 ++
ui/scripts/system.js | 52 +++
29 files changed, 980 insertions(+), 149 deletions(-)
----------------------------------------------------------------------