This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 0c13ded943cc1ac9672d8745eee90cf115204595
Merge: baad8ddc914 bf1ff10a906
Author: Daan Hoogland <d...@onecht.net>
AuthorDate: Wed Jan 15 17:52:07 2025 +0100
Merge release branch 4.20 to main
* 4.20:
Rollback of changes with errors during the VM assign (#7061)
[VMware] Consider CD/DVD drive when calculating next free unit number for
volume attachment over IDE controller (#9644)
consider a valid ipv4 address as a validish ipv4 /32 cidr (#10174)
api/src/main/java/com/cloud/vm/UserVmService.java | 2 +-
.../api/command/admin/vm/AssignVMCmd.java | 21 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 1107 ++++++++------
.../java/com/cloud/vm/UserVmManagerImplTest.java | 1533 +++++++++++++++++++-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 4 +-
.../SecondaryStorageManagerImpl.java | 9 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 7 +-
7 files changed, 2214 insertions(+), 469 deletions(-)
