Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7775A10FC7 for ; Thu, 26 Sep 2013 01:01:08 +0000 (UTC) Received: (qmail 37557 invoked by uid 500); 26 Sep 2013 01:01:06 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 37496 invoked by uid 500); 26 Sep 2013 01:01:06 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 37054 invoked by uid 99); 26 Sep 2013 01:01:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Sep 2013 01:01:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E282E90A6AB; Thu, 26 Sep 2013 01:01:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Date: Thu, 26 Sep 2013 01:01:20 -0000 Message-Id: <495b775c3e6a4a2abe593595c6f1e8b8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/24] git commit: updated refs/heads/master to 81ff479 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 Authored: Wed Sep 25 16:19:53 2013 -0700 Committer: Edison Su 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 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;