merge conflict fixes - #13046

Merged

sureshanaparti merged 4 commits into

4.22from

UnmanagedAndSnapshotFixes

Apr 23, 2026

Commits on Apr 20, 2026

merge conflict fixes
Daan Hoogland
committed
78716fb
Update server/src/test/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImplTest.java
DaanHoogland
and
Copilot
authored
3821319
Apply suggestion from @Copilot
DaanHoogland
and
Copilot
authored
d6657f2

Commits on Apr 23, 2026

fix pre-commit issue
sureshanaparti
committed
d24beb0