From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Mon, 22 Apr 2013 10:52:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sliver-openvswitch
X-Git-Tag: sliver-openvswitch-1.10.90-2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e892d5ffb5749c0534fecd903e3e6a76819f1346;hp=485e2766d816a18e1a51ddf5e12e55f38aeedf89;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 fbe1bcb4a..7be7bded0 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.9.90
-%define taglevel 3
+%define version 1.10.90
+%define taglevel 1
 
 %define debug_package %{nil}
 
@@ -57,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* Mon Apr 22 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.10.90-1
+- merged with upstream (develoment version 1.10.90)
+- integrated ALLEGRA contributions for the termination of virtual cables in external nodes.
+
 * 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