Prepare Open vSwitch 1.2.1 release.

diff --git a/ChangeLog b/ChangeLog
index d82e886..f83cd52 100644 (file)
--- 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 c7f49b6..050b98b 100644 (file)
--- 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 efff161..4186d33 100644 (file)
--- 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 ]