This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from edb62b490c6 Merge branch '4.20' into 4.22
add d50899427a7 merge forward error
No new revisions were added by this update.
Summary of changes:
server/src/main/java/com/cloud/resource/ResourceManagerImpl.java | 2 +-
server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)