Alena Prokharchyk e74969fdec VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan ... Conflicts: server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java server/src/com/cloud/network/rules/RulesManagerImpl.java		2012-08-13 11:55:34 -07:00
..
dao	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
FirewallManager.java	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
FirewallRuleVO.java	VPC : typo in FirewallRuleVO	2012-08-12 10:55:21 -07:00
PortForwardingRuleVO.java	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
RulesManager.java	CS-15743: disable static nat as a part of network resources cleanup	2012-07-30 11:08:33 -07:00
RulesManagerImpl.java	VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan	2012-08-13 11:55:34 -07:00
StaticNatImpl.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
StaticNatRuleImpl.java	VPC: removed NetworkACL interface; added getTrafficType() to Firewall	2012-07-06 11:08:00 -07:00