cloudstack/server
Alena Prokharchyk 71ead9ef4e VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-13 14:03:39 -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-15925 - when vpc provider is speficied for a new network offering, no other providers can be used 2012-08-13 14:03:39 -07:00
test VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used 2012-08-13 14:03:39 -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