etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
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
..
conf fixing line endings in server 2012-04-07 20:13:10 -04:00
scripts Source code committed 2010-08-11 09:13:29 -07:00
src/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
test 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
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project Fix corrupted eclipse project settings, schema fixes and updated template download url 2010-09-29 18:41:54 -07:00