From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Wed, 27 Feb 2013 09:01:28 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-1.10.90-1~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=620606f63cc56c7541005dc6787106789e2c364e;hp=ce5e922f9be1600e40cb2b55df5e54aded2fc9b2;p=sliver-openvswitch.git

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

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index 8337c220d..e61aedd16 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 2
+%define taglevel 3
 
 %define debug_package %{nil}
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Fri Feb 22 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.9.90-3
+- pulled mainstream - amazingly this is still known as 1.9.90 despite the size of changes
+
 * 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