mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Conflicts: api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java setup/db/db/schema-40to410.sql Signed-off-by: Rohit Yadav <bhaisaab@apache.org>