cloudstack/server
Alena Prokharchyk d93c5d0531 VPC: CS-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-08-10 16:37:33 -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-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service 2012-08-10 16:37:33 -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