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

..

com/cloud

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

resources

Switch to Apache license

2012-04-03 04:50:05 -07:00

async-job-component.xml

fixing line endings in server

2012-04-07 20:13:10 -04:00

sync-queue-component.xml

fixing line endings in server

2012-04-07 20:13:10 -04:00