cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [16/24] git commit: updated refs/heads/master to 81ff479
Date Thu, 26 Sep 2013 01:01:20 GMT
CLOUDSTACK-4405: fix vm migration during the upgrade to 4.2

Conflicts:

	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java


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

Branch: refs/heads/master
Commit: 3ddc6da10be72ad292dd18ef0a893c67f853f6c4
Parents: a96f6b3
Author: Edison Su <sudison@gmail.com>
Authored: Wed Sep 25 16:19:53 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Sep 25 16:19:53 2013 -0700

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3ddc6da1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index 9ebf926..853ffaa 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -45,6 +45,7 @@ public class BridgeVifDriver extends VifDriverBase {
 
     private static final Object _vnetBridgeMonitor = new Object();
     private String _modifyVlanPath;
+    private String bridgeNameSchema;
 
     @Override
     public void configure(Map<String, Object> params) throws ConfigurationException
{
@@ -59,6 +60,8 @@ public class BridgeVifDriver extends VifDriverBase {
             networkScriptsDir = "scripts/vm/network/vnet";
         }
 
+        bridgeNameSchema = (String) params.get("network.bridge.name.schema");
+
         String value = (String) params.get("scripts.timeout");
         _timeout = NumbersUtil.parseInt(value, 30 * 60) * 1000;
 


Mime
View raw message