alena 8c53dbcdd7 bug 11185: support multiple CIDR on overlapping port ranges for firewall rules ... status 11185: resolved fixed Conflicts: server/src/com/cloud/network/firewall/FirewallManagerImpl.java Conflicts: api/src/com/cloud/network/firewall/FirewallService.java server/src/com/cloud/network/firewall/FirewallManagerImpl.java server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java		2011-08-25 12:21:11 -07:00
..
FirewallService.java	bug 11185: support multiple CIDR on overlapping port ranges for firewall rules	2011-08-25 12:21:11 -07:00