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

Posted to commits@cloudstack.apache.org by da...@apache.org on 2019/05/23 12:31:55 UTC

[cloudstack] 01/01: Merge release branch 4.12 to master

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

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

commit 8b75d61ffc27eafa8fc67bdd6085f7f6fbd87c9c
Merge: 62c8a11 29918e2
Author: Daan Hoogland <da...@shapeblue.com>
AuthorDate: Thu May 23 14:31:21 2019 +0200

    Merge release branch 4.12 to master
    
    * 4.12:
      KVM: Fix agents dont reconnect post maintenance (#3239)

 agent/src/main/java/com/cloud/agent/Agent.java     |   4 +-
 .../java/com/cloud/resource/ResourceManager.java   |   5 +
 .../java/com/cloud/agent/manager/AgentAttache.java |   3 +-
 .../main/java/com/cloud/configuration/Config.java  |   8 -
 .../com/cloud/resource/ResourceManagerImpl.java    |  92 +++--
 .../cloud/resource/ResourceManagerImplTest.java    | 105 +++++-
 test/integration/smoke/test_host_maintenance.py    | 402 ++++++++++++++++++---
 7 files changed, 530 insertions(+), 89 deletions(-)