You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/06/25 21:22:25 UTC
[1/2] git commit: updated refs/heads/master to f74e635
Updated Branches:
refs/heads/master 6a711fc68 -> f74e63522
Disable the NioTest, it is far to dependent on the network configuration of the machine running the test.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/881a6e16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/881a6e16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/881a6e16
Branch: refs/heads/master
Commit: 881a6e164ece8e34154555b71e97c9f1763674f5
Parents: 6a711fc
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Jun 19 17:08:25 2013 -0700
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Jun 25 12:20:51 2013 -0700
----------------------------------------------------------------------
utils/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/881a6e16/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 0690c35..f4ac12b 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -192,6 +192,7 @@
<excludes>
<exclude>com/cloud/utils/testcase/*TestCase*</exclude>
<exclude>com/cloud/utils/db/*Test*</exclude>
+ <exclude>com/cloud/utils/testcase/NioTest.java</exclude>
</excludes>
</configuration>
</plugin>
[2/2] git commit: updated refs/heads/master to f74e635
Posted by hu...@apache.org.
Setting the required version of libvirt to 10.0 for the openvswitch
support. This version actually supports setting the vlan tag on an
interface.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f74e6352
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f74e6352
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f74e6352
Branch: refs/heads/master
Commit: f74e635225c1241054985c8911be59233b747f60
Parents: 881a6e1
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Jun 20 08:11:05 2013 -0700
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Jun 25 12:21:25 2013 -0700
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f74e6352/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 60cde8c..b1bc99d 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
@@ -722,8 +722,8 @@ ServerResource {
conn = LibvirtConnection.getConnection();
if (_bridgeType == BridgeType.OPENVSWITCH) {
- if (conn.getLibVirVersion() < (9 * 1000 + 11)) {
- throw new ConfigurationException("LibVirt version 0.9.11 required for openvswitch support, but version "
+ if (conn.getLibVirVersion() < (10 * 1000 + 0)) {
+ throw new ConfigurationException("LibVirt version 0.10.0 required for openvswitch support, but version "
+ conn.getLibVirVersion() + " detected");
}
}