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

diff --git a/sliver-openvswitch.spec b/sliver-openvswitch.spec
index 63204df39..7daf4956c 100644
--- a/sliver-openvswitch.spec
+++ b/sliver-openvswitch.spec
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
+* 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