This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.15 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 2286c8d2bf97810b7c55bf7a389c603a7074a751 Merge: dc91a1f e2183ed Author: Rohit Yadav <rohit.ya...@shapeblue.com> AuthorDate: Fri May 14 23:19:06 2021 +0530 Merge remote-tracking branch 'origin/4.14' into 4.15 .../java/com/cloud/resource/ResourceState.java | 1 + .../java/com/cloud/ha/HighAvailabilityManager.java | 2 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 6 +-- .../com/cloud/resource/ResourceManagerImpl.java | 53 ++++++++++++---------- 5 files changed, 33 insertions(+), 31 deletions(-)