Alena Prokharchyk 5a64d4fbb1 VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
..
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-02 09:51:21 -04:00
2012-07-17 15:50:56 -07:00