You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/04/23 04:05:00 UTC

[cloudstack] 01/01: Merge pull request #2060 from apache/4.9

This is an automated email from the ASF dual-hosted git repository.

rajani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit fc8ed22abe5c51fdfbd05eb2c7fe67fd121649e1
Merge: 524fc32 1be37e4
Author: Rajani Karuturi <ka...@users.noreply.github.com>
AuthorDate: Sun Apr 23 09:34:54 2017 +0530

    Merge pull request #2060 from apache/4.9
    
    Merge release branch 4.9 to master

 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  12 +-
 .../com/cloud/capacity/dao/CapacityDaoImpl.java    |  22 +---
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |   4 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  14 ++-
 .../com/cloud/hypervisor/vmware/mo/ClusterMO.java  | 121 ++++++++++++++++++++-
 .../src/com/cloud/hypervisor/vmware/mo/HostMO.java |  20 ++++
 .../hypervisor/vmware/mo/VmwareHypervisorHost.java |   4 +
 7 files changed, 166 insertions(+), 31 deletions(-)

diff --cc engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index d19aaf3,03a3798..4616b3f
mode 100755,100644..100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.