cloudstack/server
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
..
conf License header updates for the server folder. 2012-08-03 09:41:27 -04:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src/com/cloud 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
test Merge branch 'master' into vpc 2012-08-10 10:47:49 -07:00
.classpath CS-15875 resolved via patch from Andy Gross. 2012-08-07 14:10:11 -04:00
.project License header updates for the server folder. 2012-08-03 09:41:27 -04:00