X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=66fd05a53e58429877603dfa20144951cf7bbd1d;hb=4b0424809b823101c969a0691fc1db0c880ae64a;hp=b4a2c7d74bc5a6acc732c3834b1a747cc1927851;hpb=8d71683b7632b5b621dd21418bf33ff90865b4e0;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index b4a2c7d74..66fd05a53 100644
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@ -1,8 +1,8 @@
 %define name sliver-openvswitch
 # to check for any change:
 # grep AC_INIT configure.ac 
-%define version 1.10.90
-%define taglevel 2
+%define version 2.0.90
+%define taglevel 1
 
 %define debug_package %{nil}
 
@@ -57,6 +57,17 @@ 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
+
+* Sat Jul 06 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-3
+- merge with mainstream
+
 * Wed May 01 2013 Giuseppe Lettieri <g.lettieri@iet.unipi.it> - sliver-openvswitch-1.10.90-2
 - - fixed several bugs in the external-nodes support in exp-tool/Makefile
 - - let sliver-ovs return an error if tap device configuration failed