From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Tue, 21 Jan 2014 15:40:17 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-2.1.90-1~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fe29af4c888d48cc1f16b1a247c2ffb6f0864522;hp=1e827902be9194d71ea851c9ce2676f65eeed33a;p=sliver-openvswitch.git

Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch

Conflicts:
	sliver-openvswitch.spec
---

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index a3a5abda4..0c94daf66 100644
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@ -57,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Tue Dec 10 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-2.0.90-1
+- merge with upstream
+- switch to version 2, multi-threaded - specifically 2.0.90
+- simple connectivity test - run with 'make test'
+
 * Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.11.90-1
 - merge with mainstream