This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch ha-config-to-master in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from af98ff8 Merge branch '4.13' into ha-config-to-master
add 11ca97e merge conflict-bugs fixed
No new revisions were added by this update.
Summary of changes:
.../main/java/com/cloud/ha/HighAvailabilityManagerImpl.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
