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
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	CLOUDSTACK-4941:	2013-12-17 18:32:46 -08:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	CLOUDSTACK-6747: call a more forgiving test on the supplied peer	2014-06-25 17:16:08 +02:00
test	Merge branch '4.3-forward' into 4.3	2014-06-04 16:25:13 -07:00
pom.xml	Updating pom.xml version numbers for release 4.3.0	2014-01-21 17:29:51 -08:00