cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: refs/heads/master - Revert "CLOUDSTACK-737"
Date Fri, 08 Feb 2013 18:48:46 GMT
Updated Branches:
  refs/heads/master a2fa16761 -> 27d1f3fa0


Revert "CLOUDSTACK-737"

This reverts commit 8a86d08fe307719e50d28d61d8e9025e56ab27da.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/27d1f3fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/27d1f3fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/27d1f3fa

Branch: refs/heads/master
Commit: 27d1f3fa07a8c9b404c64aea5dcc1f3a6885fd19
Parents: a2fa167
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Fri Feb 8 10:47:40 2013 -0800
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Fri Feb 8 10:47:40 2013 -0800

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/27d1f3fa/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index b5e7431..02f90d2 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -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);


Mime
View raw message