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-8958: add dedicated ips to domain (account for now)	2015-11-16 10:17:40 +01:00
src	Merge release branch 4.7 to master	2016-01-16 19:54:41 +01:00
test/com/cloud/upgrade/dao	CLOUDSTACK-6594: Improve the logging in the util functions utilized by db upgrades currently. If the exception is to be ignored, dont log the stack trace and also dont log it in warn. Making them debug just to be little verbose during upgrade scenario.	2014-07-31 16:36:33 -07:00
pom.xml	Updating pom.xml version numbers for release 4.8.0-SNAPSHOT	2015-12-21 22:09:31 +01:00