This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 2149e82856f Merge release branch 4.17 to main
add 1b89a22ab09 fix merge conflicts of merge branch '4.17'
No new revisions were added by this update.
Summary of changes:
.../src/test/java/com/cloud/vm/VirtualMachineManagerImplTest.java | 1 +
server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
