This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 85750f9 Merge branch '4.11'
add cc35f9d CLOUDSTACK-10326: Prevent hosts fall into Maintenance when
there are running VMs on it
add 08a8330 CLOUDSTACK-10326: Fix for infinite loop on
PrepareForMaintenance
add a22ab69 Set host into ErrorInMaintenance in case of failure trying to
enter Maintenance mode
add faf2a77 Add unit tests
add 539d7e1 Merge pull request #2493 from shapeblue/fixmaintenance
add d4e302d smoketest: Fix test_vm_life_cycle secure migration tests
(#2715)
add f02e402 kvm: send unsupported answer only when applicable (#2714)
add 52b02de vpc: reuse private gateway ip for non redundant VPC (#2712)
new 1d05fea Merge branch '4.11'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/com/cloud/resource/RequestWrapper.java | 23 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 15 ++
.../kvm/resource/LibvirtComputingResource.java | 11 +-
.../resource/wrapper/LibvirtRequestWrapper.java | 3 +
.../kvm/resource/LibvirtComputingResourceTest.java | 27 ++
.../cloud/network/router/NicProfileHelperImpl.java | 8 +-
.../com/cloud/resource/ResourceManagerImpl.java | 80 +++++-
.../com/cloud/servlet/ConsoleProxyServlet.java | 10 +-
.../cloud/resource/ResourceManagerImplTest.java | 191 ++++++++++++++
test/integration/smoke/test_privategw_acl.py | 2 +-
test/integration/smoke/test_vm_life_cycle.py | 292 +++++++++------------
test/integration/smoke/test_vpc_redundant.py | 2 +-
test/integration/smoke/test_vpc_router_nics.py | 2 +-
14 files changed, 474 insertions(+), 194 deletions(-)
create mode 100644 server/test/com/cloud/resource/ResourceManagerImplTest.java
