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 b0910fc61d7 Add dynamic secondary storage selection (#7659)
add cb2b6aca45c server: check if there are active nics before network GC
(#8204)
add 98cd3b9a243 UI: Removed ICMP input fields for protocol number from ACL
List rules modal (#8253)
add 7d6dc41f99b UI: Removed redundant IP Address Column when create Port
forwarding rules (#8275)
add 724394682c7 server: Initial new vpnuser state (#8268)
new d3cad4266af Merge release branch 4.18 to main
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../api/command/user/vpn/AddVpnUserCmd.java | 3 ++
.../cloudstack/api/response/VpnUsersResponse.java | 2 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 4 ++-
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 35 +++++++++++++++-------
.../java/com/cloud/network/NetworkModelImpl.java | 9 +++---
ui/src/views/network/AclListRulesTab.vue | 2 +-
ui/src/views/network/PortForwarding.vue | 5 ----
7 files changed, 37 insertions(+), 23 deletions(-)