Prepare Open vSwitch 1.2.2 release.

diff --git a/ChangeLog b/ChangeLog
index f83cd52..7b5b932 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+v1.2.2 - 20 Sep 2011
+------------------------
+    - Bug fixes
+
 v1.2.1 - 19 Aug 2011
 ------------------------
     - Bug fixes

diff --git a/configure.ac b/configure.ac
index 050b98b..99ed8f0 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.1, ovs-bugs@openvswitch.org)
+AC_INIT(openvswitch, 1.2.2, 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 1f510f8..7c92d0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openvswitch (1.2.2-1) unstable; urgency=low
+
+  * New upstream version
+    - Various bug fixes
+    - Correct path to ovs-controller in init script.
+      (closes: #642206)
+
+ -- Open vSwitch team <dev@openvswitch.org>  Tue, 20 Sep 2011 23:51:00 +0000
+
 openvswitch (1.2.1-3) unstable; urgency=low
 
   * Allow the openvswitch-switch init script to fail gracefully