Sheng Yang 830aec3562 S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets ... Conflicts: server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java		2012-08-10 16:20:52 -07:00
..
conf	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src/com/cloud	S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets	2012-08-10 16:20:52 -07:00
test	Merge branch 'master' into vpc	2012-08-10 10:47:49 -07:00
.classpath	CS-15875 resolved via patch from Andy Gross.	2012-08-07 14:10:11 -04:00
.project	License header updates for the server folder.	2012-08-03 09:41:27 -04:00