(cloudstack) 01/01: Merge branch '4.19'

[dahn]

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 c087de4adfe0db02802ec4fe0929a5b3d6dfba2a
Merge: 046870ef764 2e4dd69fa17
Author: Daan Hoogland <d...@onecht.net>
AuthorDate: Wed Oct 2 16:50:43 2024 +0200

    Merge branch '4.19'

 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 114 ++++++++++++---------
 .../com/cloud/server/ManagementServerImpl.java     |   4 +-
 ui/src/views/compute/EditVM.vue                    |  35 +++++--
 ui/src/views/network/VpcTab.vue                    |   8 +-
 4 files changed, 98 insertions(+), 63 deletions(-)

diff --cc 
server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index e76c52b9ebf,3efe9a8788f..094f81607fe
--- a/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@@ -23,10 -23,12 +23,11 @@@ import java.util.Map
  import javax.inject.Inject;
  import javax.naming.ConfigurationException;
  
- import org.apache.cloudstack.annotation.AnnotationService;
- import org.apache.cloudstack.annotation.dao.AnnotationDao;
+ import org.apache.commons.collections.CollectionUtils;
 -import org.apache.log4j.Logger;
  import org.springframework.stereotype.Component;
  
+ import org.apache.cloudstack.annotation.AnnotationService;
+ import org.apache.cloudstack.annotation.dao.AnnotationDao;
  import org.apache.cloudstack.api.command.user.vpn.CreateVpnConnectionCmd;
  import org.apache.cloudstack.api.command.user.vpn.CreateVpnCustomerGatewayCmd;
  import org.apache.cloudstack.api.command.user.vpn.CreateVpnGatewayCmd;