summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2011-09-20 23:52:51 -0700
committerJustin Pettit <jpettit@nicira.com>2011-09-20 23:54:31 -0700
commit2887e6ea171d2fa26d244718958b69988ec9117d (patch)
tree920110417e1cd671cf2ae9cac3f50c2bd43034b1
parenteba3d1cae5c360019b8b56d93a6e7f155db9e73b (diff)
downloadopenvswitch-2887e6ea171d2fa26d244718958b69988ec9117d.tar.gz
Prepare Open vSwitch 1.2.2 release.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog9
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f83cd5225..7b5b9325a 100644
--- 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 050b98bd9..99ed8f05b 100644
--- 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 1f510f8fa..7c92d0d35 100644
--- 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