Sheng Yang 7d68e33323 S2S VPN: Use source NAT ip address for VPN gateway ... Conflicts: api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java server/src/com/cloud/network/vpc/VpcManagerImpl.java		2012-07-23 14:44:05 -07:00
..
apidoc	Merge branch 'master' into vpc	2012-06-28 17:44:08 -07:00
bindir	applying the commits from Chip Childers licensing cleanup	2012-06-26 10:44:04 -04:00
db	S2S VPN: Use source NAT ip address for VPN gateway	2012-07-23 14:44:05 -07:00
.project	Branch 2.1.refactor committed	2010-08-11 09:13:42 -07:00