X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver-openvswitch.spec;h=8337c220d335f302f535e01f155c474768232d35;hb=eb857b4824d2a62e1cc1b85c30a3da007d4942c9;hp=ace55964b7270eb0d8d33e511ee5c7f1815b13bb;hpb=7c690f462fec1af60d76c67fac226fc648ea9149;p=sliver-openvswitch.git

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index ace55964b..8337c220d 100644
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@ -2,7 +2,7 @@
 # to check for any change:
 # grep AC_INIT configure.ac 
 %define version 1.9.90
-%define taglevel 1
+%define taglevel 2
 
 %define debug_package %{nil}
 
@@ -49,6 +49,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Fri Dec 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.9.90-2
+- merged with upstream
+- handling of promisc &up/down flags for tap devices
+- small improvements to the Makefile
+
 * Fri Nov 23 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-6
 - fixes in the exp-tool makefile (bash redirections, scp with key..)