cloudstack/server/test/com/cloud
Alena Prokharchyk 929997f54e AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
When the last rule is removed for vpc ip, networkId is set to null

Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	api/src/com/cloud/api/commands/EnableStaticNatCmd.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/rules/RulesService.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:18:24 -07:00
..
agent CS-14605: OVS cleanup 2012-04-25 10:53:41 +01:00
async fixing line endings in server 2012-04-07 20:13:10 -04:00
cluster Fixed unittest 2012-04-04 16:13:51 -07:00
keystore Switch to Apache license 2012-04-03 04:50:05 -07:00
network AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created. 2012-06-15 14:18:24 -07:00
snapshot Switch to Apache license 2012-04-03 04:50:05 -07:00
storage/dao Switch to Apache license 2012-04-03 04:50:05 -07:00
upgrade CS-15220: fixed db upgrade for networks using external devices 2012-06-05 15:10:49 -07:00
user Switch to Apache license 2012-04-03 04:50:05 -07:00
utils/db Switch to Apache license 2012-04-03 04:50:05 -07:00
vm Added support for network shutdown in VPC guest networks 2012-06-15 14:07:59 -07:00