This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a change to branch 4.22
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from b8ed34e2a88 Reset modifier button's state (#12187)
add 9e86fdf1b67 Fix cloud-sysvmadmin hang (#12355)
add 6a324da27a6 MAC address assignment improvements (#12349)
add 5c1f9315ced Remove transaction from updateCapacityForHost cal (#12421)
add b5fd39fca0d Merge branch '4.20' into 4.22
No new revisions were added by this update.
Summary of changes:
.../main/java/com/cloud/network/NetworkModel.java | 8 ++
.../main/java/com/cloud/network/addr/PublicIp.java | 7 +-
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../orchestration/NetworkOrchestratorTest.java | 1 +
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 4 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +-
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 3 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 9 +-
.../com/cloud/network/IpAddressManagerImpl.java | 4 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 2 +-
.../java/com/cloud/network/NetworkModelImpl.java | 40 +++++--
.../com/cloud/network/guru/DirectNetworkGuru.java | 2 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 5 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 6 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 6 +-
.../com/cloud/network/router/NicProfileHelper.java | 3 +-
.../cloud/network/router/NicProfileHelperImpl.java | 11 +-
.../com/cloud/network/Ipv6AddressManagerTest.java | 2 +
.../com/cloud/network/MockNetworkModelImpl.java | 18 +++
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 18 +++
setup/bindir/cloud-sysvmadm.in | 129 ++++++---------------
.../main/java/com/cloud/utils/net/NetUtils.java | 6 +-
22 files changed, 154 insertions(+), 134 deletions(-)