You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2014/01/03 09:13:36 UTC
git commit: updated refs/heads/4.2 to 79f609c
Updated Branches:
refs/heads/4.2 34126362f -> 79f609ca1
Commit 3a999e7 changed the return values for the Script.execute function, this introduced a bug in the openvswitch bridge detection code.
Hugo fixed it in master by commit c024a9382 and 725bed43b
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/79f609ca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79f609ca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79f609ca
Branch: refs/heads/4.2
Commit: 79f609ca19fc44aab8de8294f234537936bc3613
Parents: 3412636
Author: Wei Zhou <w....@leaseweb.com>
Authored: Fri Jan 3 09:10:44 2014 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Jan 3 09:10:44 2014 +0100
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +-
.../kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79f609ca/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index dfb5fba..3bf97b0 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1092,7 +1092,7 @@ ServerResource {
command.add("-c");
command.add("ovs-vsctl br-exists " + networkName);
String result = command.execute(null);
- if ("Ok".equals(result)) {
+ if ("0".equals(result)) {
return true;
} else {
return false;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/79f609ca/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
index 7038d7e..bdeb752 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
@@ -178,7 +178,7 @@ public class OvsVifDriver extends VifDriverBase {
command.add("-c");
command.add("ovs-vsctl br-exists " + bridgeName);
String result = command.execute(null);
- if ("Ok".equals(result)) {
+ if ("0".equals(result)) {
return true;
} else {
return false;