[cloudstack] branch 4.15 updated (dc91a1f -> 2286c8d)

[ro...@apache.org]

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

rohit pushed a change to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from dc91a1f  server: destroy ssvm, cpvm on last host maintenance  (#4644)
     add e2183ed  forceha: fix two issues when (1)stop vm from inside (2) force remove host (#4647)
     new 2286c8d  Merge remote-tracking branch 'origin/4.14' into 4.15

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

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14' into 4.15

[ro...@apache.org]

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 <ro...@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(-)