X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=e8dda278d6ab150def8057cca0927e3c5c67d36b;hb=99ab7312c17cd4ab603eb6194c50b9f1ef3ca1c9;hp=63204df394298c04f3e5f2d63508167916c3fb1c;hpb=2b92bb41f78622084452dcb647eef29bc16eb700;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index 63204df39..e8dda278d 100644
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@ -1,7 +1,7 @@
 %define name sliver-openvswitch
 # to check for any change:
 # grep AC_INIT configure.ac 
-%define version 1.11.90
+%define version 2.0.90
 %define taglevel 0
 
 %define debug_package %{nil}
@@ -57,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* 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