etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "CLOUDSTACK-737" 

This reverts commit 8a86d08fe3.
This commit is contained in:
Anthony Xu 2013-02-08 10:47:40 -08:00
parent a2fa167613
commit 27d1f3fa07
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2878,9 +2878,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use
<<<<<<< HEAD
throw new InvalidParameterValueException("need to specify networkIDs");
}
if (networkIdList.size() > 1 ) {
throw new InvalidParameterValueException("VM can only be on one network in Zone with Security group enabled zone");
}
// Verify that all the networks are Shared/Guest; can't create combination of SG enabled and disabled networks
for (Long networkId : networkIdList) {
NetworkVO network = _networkDao.findById(networkId);