This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from a1f825e python3: Migrate Marvin and smoketests to python3 (#4727)
add 7a7fd27 setup: Fixed error when passing shell reserved characters to
setup databases (#4995)
add bc80815 server: Adding VPN options for IKE version and IKE split
connections (#4953)
add fce84e6 Merge remote-tracking branch 'origin/4.15'
No new revisions were added by this update.
Summary of changes:
.../cloud/network/Site2SiteCustomerGateway.java | 4 ++
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 15 ++++++
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 15 ++++++
.../response/Site2SiteCustomerGatewayResponse.java | 16 ++++++
.../response/Site2SiteVpnConnectionResponse.java | 16 ++++++
.../agent/api/routing/Site2SiteVpnCfgCommand.java | 23 +++++++-
.../facade/Site2SiteVpnConfigItem.java | 2 +-
.../virtualnetwork/model/Site2SiteVpn.java | 24 +++++++--
.../virtualnetwork/VirtualRoutingResourceTest.java | 6 +--
.../network/dao/Site2SiteCustomerGatewayVO.java | 28 +++++++++-
.../resources/META-INF/db/schema-41500to41510.sql | 4 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 4 ++
.../cloud/network/router/CommandSetupHelper.java | 4 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 62 ++++++++++++++++++----
.../VirtualNetworkApplianceManagerImplTest.java | 2 +-
systemvm/debian/opt/cloud/bin/configure.py | 35 ++++++++++--
systemvm/debian/opt/cloud/bin/ipsectunnel.sh | 35 ++++++++++--
ui/public/locales/ca.json | 2 +
ui/public/locales/en.json | 4 ++
ui/public/locales/it_IT.json | 2 +
ui/public/locales/nb_NO.json | 2 +
ui/public/locales/nl_NL.json | 2 +
ui/public/locales/pl.json | 2 +
ui/src/config/section/network.js | 11 ++--
ui/src/views/network/CreateVpnCustomerGateway.vue | 47 +++++++++++++++-
26 files changed, 334 insertions(+), 35 deletions(-)
