Prepare for 2.2.0.

Signed-off-by: Justin Pettit <jpettit@nicira.com>

diff --git a/NEWS b/NEWS
index 02ecf5b..98db34e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Post-v2.1.0
+v2.2.0 - xx xxx xxx
 ---------------------
    - Internal ports are no longer brought up by default, because it
      should be an administrator task to bring up devices as they are
@@ -19,7 +19,7 @@ Post-v2.1.0
    - Added support for custom vlog patterns in Python
 
 
-v2.1.0 - xx xxx xxxx
+v2.1.0 - 19 Mar 2014
 ---------------------
    - Address prefix tracking support for flow tables.  New columns
      "prefixes" in OVS-DB table "Flow_Table" controls which packet

diff --git a/configure.ac b/configure.ac
index 3065528..4eebaee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 2.1.90, bugs@openvswitch.org)
+AC_INIT(openvswitch, 2.2.0, bugs@openvswitch.org)
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/debian/changelog b/debian/changelog
index 3a1056f..601302e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,25 @@
-openvswitch (2.1.90-1) unstable; urgency=low
+openvswitch (2.2.0-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
-    - Nothing yet!  Try NEWS...
-
- -- Open vSwitch team <dev@openvswitch.org>  Mon, 23 Dec 2013 18:07:18 -0700
+   - Internal ports are no longer brought up by default, because it
+     should be an administrator task to bring up devices as they are
+     configured properly.
+   - ovs-vsctl now reports when ovs-vswitchd fails to create a new port or
+     bridge.
+   - The "ovsdbmonitor" graphical tool has been removed, because it was
+     poorly maintained and not widely used.
+   - New "check-ryu" Makefile target for running Ryu tests for OpenFlow
+     controllers against Open vSwitch.  See INSTALL for details.
+   - Added IPFIX support for SCTP flows and templates for ICMPv4/v6 flows.
+   - Upon the receipt of a SIGHUP signal, ovs-vswitchd no longer reopens its
+     log file (it will terminate instead). Please use 'ovs-appctl vlog/reopen'
+     instead.
+   - Support for Linux kernels up to 3.13. From Kernel 3.12 onwards OVS uses
+     tunnel API for GRE and VXLAN.
+   - Added DPDK support.
+   - Added support for custom vlog patterns in Python
+
+ -- Open vSwitch team <dev@openvswitch.org>  Wed, 19 Mar 2014 16:08:38 -0700
 
 openvswitch (2.1.0-1) unstable; urgency=low
    [ Open vSwitch team ]
@@ -71,7 +87,7 @@ openvswitch (2.1.0-1) unstable; urgency=low
      users assumed incorrectly that ovs-controller was a necessary or
      desirable part of an Open vSwitch deployment.
 
- -- Open vSwitch team <dev@openvswitch.org>  Mon, 23 Dec 2013 18:07:18 -0700
+ -- Open vSwitch team <dev@openvswitch.org>  Wed, 19 Mar 2014 16:08:38 -0700
 
 openvswitch (2.0.0-1) unstable; urgency=low
    [ Open vSwitch team ]