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 62c8a11  Fix iops values when creating a compute offering (#3345)
     add e86f671  KVM: Fix agents dont reconnect post maintenance (#3239)
     add 29918e2  Merge release branch 4.11 to 4.12
     new 8b75d61  Merge release branch 4.12 to master

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:
 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(-)

Reply via email to