You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/05/03 04:51:01 UTC
[9/9] git commit: updated refs/heads/4.8 to 126a039
Merge branch '4.7' into 4.8
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/126a039e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/126a039e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/126a039e
Branch: refs/heads/4.8
Commit: 126a039eb812da2624f681af61d4ce6e5fe3557e
Parents: d11194a 987e800
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue May 3 08:20:27 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue May 3 08:20:27 2016 +0530
----------------------------------------------------------------------
api/src/com/cloud/vm/VmDetailConstants.java | 2 +-
debian/control | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 8 +--
.../cloud/vm/VirtualMachineManagerImplTest.java | 28 ++++++++++
.../com/cloud/hypervisor/guru/VMwareGuru.java | 4 +-
.../vmware/resource/VmwareResource.java | 17 +++---
.../resource/VmwareStorageProcessor.java | 28 ++++------
pom.xml | 2 +-
.../com/cloud/api/query/QueryManagerImpl.java | 6 +--
.../com/cloud/storage/VolumeApiServiceImpl.java | 36 ++++++++++++-
server/src/com/cloud/vm/UserVmManager.java | 2 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 18 +++++--
.../cloud/storage/VolumeApiServiceImplTest.java | 25 +++++++++
server/test/com/cloud/vm/UserVmManagerTest.java | 21 ++++++++
test/integration/smoke/test_loadbalance.py | 2 +-
.../utils/volume/VirtualMachineDiskInfo.java | 48 +++++++++++++++++
.../volume/VirtualMachineDiskInfoTest.java | 55 ++++++++++++++++++++
.../vmware/mo/VirtualMachineDiskInfo.java | 42 ---------------
.../mo/VirtualMachineDiskInfoBuilder.java | 2 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 2 +-
20 files changed, 263 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/126a039e/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/126a039e/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/126a039e/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------