etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test
History
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
..
com/cloud VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip 2012-07-20 17:12:34 -07:00
resources Switch to Apache license 2012-04-03 04:50:05 -07:00
async-job-component.xml fixing line endings in server 2012-04-07 20:13:10 -04:00
sync-queue-component.xml fixing line endings in server 2012-04-07 20:13:10 -04:00