etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/src/com/cloud/user
History
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
..
dao fixing line endings in server 2012-04-07 20:13:10 -04:00
AccountDetailVO.java fixing line endings in server 2012-04-07 20:13:10 -04:00
AccountDetailsDao.java fixing line endings in server 2012-04-07 20:13:10 -04:00
AccountDetailsDaoImpl.java fixing line endings in server 2012-04-07 20:13:10 -04:00
AccountManager.java Switch to Apache license 2012-04-03 04:50:05 -07:00
AccountManagerImpl.java 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
DomainManager.java Switch to Apache license 2012-04-03 04:50:05 -07:00
DomainManagerImpl.java Switch to Apache license 2012-04-03 04:50:05 -07:00