From: Justin Pettit <jpettit@nicira.com>
Date: Sat, 20 Aug 2011 00:23:47 +0000 (-0700)
Subject: Prepare Open vSwitch 1.2.1 release.
X-Git-Tag: v1.2.1^0
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=85b8d560a2a987d83c29b377bcb13c0bc1a32863;hp=003c21671fc68fa8bcd06844a7fb8c14f525e8b1;p=sliver-openvswitch.git

Prepare Open vSwitch 1.2.1 release.
---

diff --git a/ChangeLog b/ChangeLog
index d82e886d2..f83cd5225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+v1.2.1 - 19 Aug 2011
+------------------------
+    - Bug fixes
+
 v1.2.0 - 03 Aug 2011
 ------------------------
     - New "ofproto" abstraction layer to ease porting to hardware
diff --git a/configure.ac b/configure.ac
index c7f49b6a2..050b98bd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 1.2.0, ovs-bugs@openvswitch.org)
+AC_INIT(openvswitch, 1.2.1, ovs-bugs@openvswitch.org)
 NX_BUILDNR
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/changelog b/debian/changelog
index efff16163..4186d33b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openvswitch (1.2.1-1) unstable; urgency=low
+
+  [ Open vSwitch team ]
+  * New upstream version
+    - Bug fixes
+
+ -- Open vSwitch team <dev@openvswitch.org>  Fri, 19 Aug 2011 19:23:00 +0000
+
 openvswitch (1.2.0-1) unstable; urgency=low
 
   [ Open vSwitch team ]