etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
History
Alena Prokharchyk 1abdb876c9 1) Allow having multiple shared networks with the same vlan 
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/network/NetworkService.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
 		2012-06-15 15:57:56 -07:00
..
conf Removed bad word from log4j config files. 2011-02-08 13:55:40 -08:00
scripts
…
src/com/cloud 1) Allow having multiple shared networks with the same vlan 2012-06-15 15:57:56 -07:00
test Merge branch 'vpc-3.0.x' into 3.0.x 2012-06-14 19:04:59 -07:00
.classpath bug 6745: Using UUID instead of integers - for System VM s 2011-11-03 07:33:57 -07:00
.project
…