[ovs-dev] [PATCH 1/2] Prepare for 2.3.0.

[Justin Pettit]

Signed-off-by: Justin Pettit <jpettit at nicira.com>
---
 NEWS             |    4 ++--
 configure.ac     |    2 +-
 debian/changelog |   16 +++++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 704513e..dc5ec7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Post-v2.2.0
+v2.3.0 - xx xxx xxxx
 ---------------------
    - OpenFlow 1.1, 1.2, and 1.3 are now enabled by default in
      ovs-vswitchd.
@@ -12,7 +12,7 @@ Post-v2.2.0
      older kernel module, some workloads may perform worse with the
      new userspace.
 
-v2.2.0 - xx xxx xxx
+v2.2.0 - Internal Release
 ---------------------
    - Internal ports are no longer brought up by default, because it
      should be an administrator task to bring up devices as they are
diff --git a/configure.ac b/configure.ac
index 16bc6a6..1977706 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 2.2.90, bugs at openvswitch.org)
+AC_INIT(openvswitch, 2.3.0, bugs at 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 3c42113..6c33937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
-openvswitch (2.2.90-1) unstable; urgency=low
+openvswitch (2.3.0-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
-    - Nothing yet!  Try NEWS...
-
- -- Open vSwitch team <dev at openvswitch.org>  Wed, 19 Mar 2014 16:08:38 -0700
+   - OpenFlow 1.1, 1.2, and 1.3 are now enabled by default in
+     ovs-vswitchd.
+   - Linux kernel datapath now has an exact match cache optimizing the
+     flow matching process.
+   - Datapath flows now have partially wildcarded tranport port field
+     matches.  This reduces userspace upcalls, but increases the
+     number of different masks in the datapath.  The kernel datapath
+     exact match cache removes the overhead of matching the incoming
+     packets with the larger number of masks, but when paired with an
+     older kernel module, some workloads may perform worse with the
+     new userspace.
+
+ -- Open vSwitch team <dev at openvswitch.org>  Thu, 15 May 2014 17:08:39 -0700
 
 openvswitch (2.2.0-1) unstable; urgency=low
    [ Open vSwitch team ]
-- 
1.7.5.4