This is an automated email from the ASF dual-hosted git repository. nvazquez pushed a commit to branch 4.11 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 539d7e10f3f51d4a7a5621130f4db84cb21bcf83 Merge: 39471c8 faf2a77 Author: Nicolas Vazquez <[email protected]> AuthorDate: Wed Jun 20 12:00:58 2018 -0300 Merge pull request #2493 from shapeblue/fixmaintenance CLOUDSTACK-10326: Prevent hosts fall into Maintenance when there are running VMs on it .../schema/src/com/cloud/vm/dao/VMInstanceDao.java | 2 + .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 15 ++ .../com/cloud/resource/ResourceManagerImpl.java | 75 +++++++- .../src/com/cloud/servlet/ConsoleProxyServlet.java | 10 +- .../cloud/resource/ResourceManagerImplTest.java | 191 +++++++++++++++++++++ 5 files changed, 287 insertions(+), 6 deletions(-)
