cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/4.2 to 13c1c62
Date Tue, 16 Jul 2013 23:07:15 GMT
Updated Branches:
  refs/heads/4.2 9a9d27788 -> 13c1c6291


CLOUDSTACK-1670: Fix the order of user vm's multiple nics

They should follow the order of networkIds parameter of deployVMCmd(). And eth0
would be always on default network.


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

Branch: refs/heads/4.2
Commit: 13c1c6291c88c51048971da8a5649fcd1602b730
Parents: 9a9d277
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Tue Jul 16 16:06:01 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Tue Jul 16 16:07:05 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13c1c629/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 53316b8..9968690 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -2569,7 +2570,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Use
 
         List<Pair<NetworkVO, NicProfile>> networks = new ArrayList<Pair<NetworkVO,
NicProfile>>();
 
-        Map<String, NicProfile> networkNicMap = new HashMap<String, NicProfile>();
+        LinkedHashMap<String, NicProfile> networkNicMap = new LinkedHashMap<String,
NicProfile>();
 
         short defaultNetworkNumber = 0;
         boolean securityGroupEnabled = false;


Mime
View raw message