Alena Prokharchyk 810151586b 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 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		2012-06-15 16:47:13 -07:00
..
conf	fixing line endings in server	2012-04-07 20:13:10 -04:00
scripts	…
src/com/cloud	1) Allow having multiple shared networks with the same vlan	2012-06-15 16:47:13 -07:00
test	CS-15220: fixed db upgrade for networks using external devices	2012-06-05 15:10:49 -07:00
.classpath	bug 6745: Using UUID instead of integers - for System VM s	2011-11-03 07:33:57 -07:00
.project	…