From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Sun, 16 Dec 2012 18:12:29 +0000 (+0100)
Subject: Merge branch 'hotfix' into make-improv
X-Git-Tag: sliver-openvswitch-1.9.90-2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7c690f462fec1af60d76c67fac226fc648ea9149;hp=-c;p=sliver-openvswitch.git

Merge branch 'hotfix' into make-improv

Conflicts:
	sliver-openvswitch.spec
---

7c690f462fec1af60d76c67fac226fc648ea9149
diff --combined sliver-openvswitch.spec
index 5fe2b717d,4737fe980..ace55964b
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@@ -1,8 -1,8 +1,8 @@@
  %define name sliver-openvswitch
  # to check for any change:
  # grep AC_INIT configure.ac 
 -%define version 1.8.90
 -%define taglevel 6
 +%define version 1.9.90
 +%define taglevel 1
  
  %define debug_package %{nil}
  
@@@ -49,6 -49,9 +49,9 @@@ rm -rf $RPM_BUILD_ROO
  %postun
  
  %changelog
+ * 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..)
+ 
  * Tue Oct 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliver-openvswitch-1.8.90-5
  - numerous additional make targets for finer control (use make help)
  - including gprobe for reporting traffic to an ndnmap instance