Remi Bergsma 75b68c6829 Merge release branch 4.7 to master ...

* 4.7:
  Fix unable to setup more than one Site2Site VPN Connection
  FIX S2S VPN rVPC: Check only redundant routers in state MASTER
  PEP8 of integration/smoke/test_vpc_vpn
  Add S2S VPN test for Redundant VPC
  Make integration/smoke/test_vpc_vpn Hypervisor independant
  FIX VPN: non-working ipsec commands
  [UI] MADNESS
  [DB] Add force_encap field to s2s_customer_gateway table
  [ROUTER] Add forceencaps field to python router ipsec config method
  [TEST] unittest needs rework
  [MARVIN] Add forceencap field to VpnCustomerGateway class in marvin base
  [CORE] Add Force UDP Encapsulation option to Site2Site VPN
  CLOUDSTACK-9186: Root admin cannot see VPC created by Domain admin user
  CLOUDSTACK-9192: UpdateVpnCustomerGateway is failing
  CLOUDSTACK-6485 prevent ip asignment of private gw iface
  CLOUDSTACK-9204 Do not error when staticroute is already gone
  make both check lines consistent
  CLOUDSTACK-9181 Prevent syntax error in checkrouter.sh
  CLOUDSTACK-9202 Bump ssh timeout

2016-01-16 19:54:41 +01:00

..

resources/META-INF/cloudstack

CLOUDSTACK-9105: Logging enhancement: Handle/reference to track API calls end to end in the MS logs

2015-12-04 12:45:57 +05:30

src

[CORE] Add Force UDP Encapsulation option to Site2Site VPN

2016-01-07 19:27:37 +01:00

test

[TEST] unittest needs rework

2016-01-07 19:27:42 +01:00

pom.xml

Updating pom.xml version numbers for release 4.8.0-SNAPSHOT

2015-12-21 22:09:31 +01:00