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
..
com/cloud	Merge branch '4.3-forward' into 4.3	2014-06-04 16:25:13 -07:00
org/apache/cloudstack	CLOUDSTACK-6747: call a more forgiving test on the supplied peer	2014-06-25 17:16:08 +02:00