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 2013/02/27 22:57:41 UTC
[17/23] git commit: refs/heads/master - Merge branch 'master' into
ui-regions
Merge branch 'master' into ui-regions
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/79bfbe32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/79bfbe32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/79bfbe32
Branch: refs/heads/master
Commit: 79bfbe32cefaa7338e491fa6671ee22dd4fffe77
Parents: 2386270 8ba91fc
Author: Brian Federle <br...@citrix.com>
Authored: Wed Feb 27 08:37:31 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Feb 27 08:37:31 2013 -0800
----------------------------------------------------------------------
agent/pom.xml | 22 +-
.../com/cloud/agent/api/to/VirtualMachineTO.java | 31 +
api/src/com/cloud/network/TrafficLabel.java | 36 +
.../org/apache/cloudstack/api/ApiConstants.java | 5 +-
.../api/command/admin/cluster/AddClusterCmd.java | 28 +
.../admin/storage/CreateStoragePoolCmd.java | 4 +-
.../api/command/user/zone/ListZonesByCmd.java | 7 +
awsapi/pom.xml | 2 +-
client/pom.xml | 28 +-
client/tomcatconf/classpath.conf.in | 24 +-
client/tomcatconf/componentContext.xml.in | 8 +-
client/tomcatconf/components.xml.in | 4 -
core/src/com/cloud/storage/DiskOfferingVO.java | 4 +
.../cloud/storage/template/RawImageProcessor.java | 1 +
debian/README | 6 -
debian/changelog | 6 +
debian/cloud-agent-deps.install | 18 -
debian/cloud-agent-libs.install | 19 -
debian/cloud-agent.config | 17 -
debian/cloud-agent.install | 25 -
debian/cloud-agent.postinst | 34 -
debian/cloud-cli.config | 17 -
debian/cloud-cli.install | 21 -
debian/cloud-client-ui.install | 19 -
debian/cloud-client.config | 17 -
debian/cloud-client.install | 58 -
debian/cloud-client.postinst | 49 -
debian/cloud-core.install | 19 -
debian/cloud-deps.install | 34 -
debian/cloud-management.config | 17 -
debian/cloud-python.install | 18 -
debian/cloud-scripts.install | 27 -
debian/cloud-server.install | 32 -
debian/cloud-setup.install | 25 -
debian/cloud-system-iso.install | 18 -
debian/cloud-usage.install | 23 -
debian/cloud-usage.postinst | 47 -
debian/cloud-utils.install | 22 -
debian/cloudstack-agent.install | 25 +
debian/cloudstack-awsapi.install | 18 +
debian/cloudstack-cli.install | 16 +
debian/cloudstack-common.install | 33 +
debian/cloudstack-docs.install | 16 +
debian/cloudstack-management.install | 31 +
debian/cloudstack-management.postinst | 26 +
debian/cloudstack-usage.install | 21 +
debian/control | 133 +--
debian/rules | 124 ++-
docs/en-US/event-framework.xml | 110 ++
docs/en-US/events.xml | 18 +-
docs/publican-cloudstack/defaults.cfg | 2 +-
docs/publican-cloudstack/en-US/Legal_Notice.xml | 9 +
.../en-US/images/title_logo.svg | 32 +-
docs/publican-cloudstack/publican-cloudstack.spec | 6 +-
.../cloud/entity/api/VirtualMachineEntity.java | 4 +-
.../api/storage/StoragePoolAllocator.java | 45 +
.../engine/cloud/entity/api/VMEntityManager.java | 5 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 5 +-
.../cloud/entity/api/VirtualMachineEntityImpl.java | 15 +-
engine/storage/integration-test/pom.xml | 23 +
.../storage/allocator/StorageAllocatorTest.java | 439 +++++++
.../StorageAllocatorTestConfiguration.java | 79 ++
.../storage/test/ChildTestConfiguration.java | 182 ++--
.../cloudstack/storage/test/TestConfiguration.java | 8 -
.../test/resource/StorageAllocatorTestContext.xml | 45 +
.../test/resource/storageContext.xml | 48 +-
.../storage/HypervsiorHostEndPointRpcServer.java | 10 +-
.../allocator/AbstractStoragePoolAllocator.java | 192 +++
.../ClusterScopeStoragePoolAllocator.java | 105 ++
.../GarbageCollectingStoragePoolAllocator.java | 91 ++
.../allocator/LocalStoragePoolAllocator.java | 126 ++
.../allocator/UseLocalForRootAllocator.java | 61 +
.../allocator/ZoneWideStoragePoolAllocator.java | 80 ++
.../storage/motion/AncientDataMotionStrategy.java | 20 +-
.../AncientPrimaryDataStoreLifeCyclImpl.java | 958 --------------
.../AncientPrimaryDataStoreLifeCycleImpl.java | 963 +++++++++++++++
.../AncientPrimaryDataStoreProviderImpl.java | 4 +-
.../cloudstack/framework/events/EventBus.java | 4 +-
framework/rest/pom.xml | 4 +
packaging/centos63/cloud.spec | 2 +-
packaging/debian/init/cloud-agent | 167 +++
packaging/debian/init/cloud-management | 244 ++++
packaging/debian/init/cloud-usage | 131 ++
packaging/debian/replace.properties | 6 +-
.../root/redundant_router/arping_gateways.sh.templ | 4 +-
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 111 +-
plugins/hypervisors/kvm/pom.xml | 68 +-
.../kvm/resource/LibvirtComputingResource.java | 16 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 184 +++
.../hypervisor/vmware/VmwareServerDiscoverer.java | 252 ++++-
.../hypervisor/vmware/manager/VmwareManager.java | 6 -
.../vmware/manager/VmwareManagerImpl.java | 69 +-
.../hypervisor/vmware/resource/VmwareResource.java | 104 +-
.../src/com/cloud/network/VmwareTrafficLabel.java | 118 ++
plugins/storage-allocators/random/pom.xml | 10 +-
.../allocator/RandomStoragePoolAllocator.java | 91 --
.../allocator/RandomStoragePoolAllocator.java | 78 ++
pom.xml | 3 +-
server/pom.xml | 37 +
.../src/com/cloud/api/query/QueryManagerImpl.java | 3 +
.../agentlb/dao/HostTransferMapDaoImpl.java | 50 +-
server/src/com/cloud/configuration/Config.java | 10 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 11 +-
server/src/com/cloud/event/ActionEventUtils.java | 19 +-
server/src/com/cloud/event/AlertGenerator.java | 21 +-
server/src/com/cloud/event/UsageEventUtils.java | 21 +-
server/src/com/cloud/host/dao/HostDaoImpl.java | 5 +
server/src/com/cloud/network/NetworkModelImpl.java | 6 +-
.../com/cloud/network/NetworkStateListener.java | 13 +-
server/src/com/cloud/resource/ResourceManager.java | 1 +
.../com/cloud/resource/ResourceManagerImpl.java | 18 +
.../src/com/cloud/storage/StorageManagerImpl.java | 86 +-
.../src/com/cloud/storage/VolumeManagerImpl.java | 2 +-
.../allocator/AbstractStoragePoolAllocator.java | 209 ----
.../allocator/FirstFitStoragePoolAllocator.java | 175 ---
.../GarbageCollectingStoragePoolAllocator.java | 105 --
.../allocator/LocalStoragePoolAllocator.java | 288 -----
.../storage/allocator/StoragePoolAllocator.java | 53 -
.../allocator/UseLocalForRootAllocator.java | 83 --
.../src/com/cloud/storage/dao/StoragePoolDao.java | 12 +-
.../com/cloud/storage/dao/StoragePoolDaoImpl.java | 93 ++-
.../storage/listener/SnapshotStateListener.java | 18 +-
.../storage/listener/VolumeStateListener.java | 15 +-
.../src/com/cloud/upgrade/dao/Upgrade410to420.java | 88 ++-
server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
server/src/com/cloud/vm/UserVmStateListener.java | 17 +-
.../cloud/resource/MockResourceManagerImpl.java | 7 +
setup/bindir/cloud-setup-databases.in | 3 +
tools/apidoc/generateadmincommands.xsl | 8 +
tools/appliance/build.sh | 5 +-
.../appliance/definitions/systemvmtemplate/base.sh | 4 +-
.../definitions/systemvmtemplate/cleanup.sh | 1 +
.../definitions/systemvmtemplate/definition.rb | 2 +-
.../definitions/systemvmtemplate/postinstall.sh | 114 ++-
.../definitions/systemvmtemplate/preseed.cfg | 8 +-
.../definitions/systemvmtemplate/zerodisk.sh | 14 +-
tools/marvin/marvin/codegenerator.py | 20 +
usage/pom.xml | 4 +-
utils/src/com/cloud/utils/db/Transaction.java | 4 +-
.../cloud/utils/db/TransactionContextBuilder.java | 13 +-
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 8 +
.../vmware/mo/DistributedVirtualSwitchMO.java | 47 +
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 331 ++++--
.../hypervisor/vmware/mo/VirtualSwitchType.java | 37 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 4 +
vmware-base/test/com/cloud/vmware/TestVMWare.java | 245 ++++-
146 files changed, 5460 insertions(+), 3472 deletions(-)
----------------------------------------------------------------------