You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/02/22 15:01:10 UTC
[56/58] [abbrv] git commit: refs/heads/qemu-img - Merge branch
'master' into qemu-img
Merge branch 'master' into qemu-img
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c6f6fce6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c6f6fce6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c6f6fce6
Branch: refs/heads/qemu-img
Commit: c6f6fce68fe4a42ded8deba5d551e575f4dd5ab8
Parents: 6bc2f98 5f8a2ee
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Feb 22 14:46:28 2013 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Feb 22 14:46:28 2013 +0100
----------------------------------------------------------------------
.../com/cloud/agent/api/to/VirtualMachineTO.java | 15 +-
api/src/com/cloud/resource/ResourceService.java | 2 +-
api/src/com/cloud/vm/VirtualMachineProfile.java | 6 +
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../api/command/admin/cluster/AddClusterCmd.java | 27 ++
.../command/admin/cluster/UpdateClusterCmd.java | 27 ++-
.../cloudstack/api/response/ClusterResponse.java | 20 ++
packaging/centos63/cloud-agent.rc | 6 +-
packaging/centos63/cloud-usage.rc | 6 +-
.../cloud/baremetal/manager/BareMetalPlanner.java | 21 +-
.../kvm/resource/LibvirtComputingResource.java | 16 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 8 +
.../com/cloud/agent/manager/MockVmManagerImpl.java | 2 +-
.../com/cloud/resource/AgentRoutingResource.java | 6 +-
.../vmware/manager/VmwareManagerImpl.java | 12 -
.../hypervisor/vmware/resource/VmwareResource.java | 44 +--
.../xen/resource/CitrixResourceBase.java | 8 +-
.../hypervisor/xen/resource/XcpServerResource.java | 16 +-
.../xen/resource/XenServer56FP1Resource.java | 6 +-
.../manager/allocator/impl/FirstFitAllocator.java | 16 +-
server/src/com/cloud/api/ApiDBUtils.java | 7 +
server/src/com/cloud/api/ApiResponseHelper.java | 16 +-
server/src/com/cloud/capacity/CapacityManager.java | 4 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 72 +++--
.../cloud/capacity/ComputeCapacityListener.java | 5 +-
server/src/com/cloud/capacity/dao/CapacityDao.java | 14 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 243 ++++++++-------
server/src/com/cloud/deploy/FirstFitPlanner.java | 87 +++---
.../com/cloud/hypervisor/HypervisorGuruBase.java | 8 +-
.../com/cloud/resource/ResourceManagerImpl.java | 18 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 14 +
.../com/cloud/vm/VirtualMachineProfileImpl.java | 28 ++-
.../com/cloud/capacity/CapacityManagerTest.java | 61 ++++
.../cloud/resource/MockResourceManagerImpl.java | 3 +-
setup/db/create-schema.sql | 1 -
setup/db/db/schema-410to420.sql | 1 +
ui/scripts/system.js | 57 ++++
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 7 +-
38 files changed, 603 insertions(+), 309 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c6f6fce6/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------