Daan Hoogland 8d0f49addd CLOUDSTACK-6747: call a more forgiving test on the supplied peer ... cidr-list (cherry picked from commit 17850c7aff) Conflicts: api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java		2014-06-25 17:16:08 +02:00
..
resources/META-INF/cloudstack/api-planner	Add missing licenses	2013-10-23 15:20:08 -07:00
src	CLOUDSTACK-6747: call a more forgiving test on the supplied peer	2014-06-25 17:16:08 +02:00
test	check for BroadcastDomainTypes on sourceNatIp(cherry picked from commit	2014-02-18 14:12:50 -08:00
pom.xml	Updating pom.xml version numbers for release 4.3.0	2014-01-21 17:29:51 -08:00