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

[Justin Pettit]

Signed-off-by: Justin Pettit <jpettit at ovn.org>
---
 NEWS             |  2 +-
 configure.ac     |  2 +-
 debian/changelog | 42 ++++++++++++++++++++++++++++++++++++++----
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index dd0295c..71b3d33 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Post-v2.4.0
+v2.5.0 - xx xxx xxxx
 ---------------------
    - Dropped support for Python older than version 2.7.  As a consequence,
      using Open vSwitch 2.5 or later on XenServer 6.5 or earlier (which
diff --git a/configure.ac b/configure.ac
index c828d2c..1ac3b5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.63)
-AC_INIT(openvswitch, 2.4.90, bugs at openvswitch.org)
+AC_INIT(openvswitch, 2.5.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 af6e8d0..42519d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,43 @@
-openvswitch (2.4.90-1) unstable; urgency=low
+openvswitch (2.5.0-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
-    - Nothing yet!  Try NEWS...
-
- -- Open vSwitch team <dev at openvswitch.org>  Wed, 17 Jun 2015 16:09:32 -0700
+   - Dropped support for Python older than version 2.7.  As a consequence,
+     using Open vSwitch 2.5 or later on XenServer 6.5 or earlier (which
+     have Python 2.4) requires first installing Python 2.7.
+   - OpenFlow:
+     * Group chaining (where one OpenFlow group triggers another) is
+       now supported.
+     * OpenFlow 1.4+ "importance" is now considered for flow eviction.
+     * OpenFlow 1.4+ OFPTC_EVICTION is now implemented.
+     * OpenFlow 1.4+ OFPTC_VACANCY_EVENTS is now implemented.
+     * OpenFlow 1.4+ OFPMP_TABLE_DESC is now implemented.
+     * Allow modifying the ICMPv4/ICMPv6 type and code fields.
+   - ovs-ofctl:
+     * New "out_group" keyword for OpenFlow 1.1+ matching on output group.
+   - Support for matching/generating options as well as the OAM bit with
+     Geneve tunnels.
+   - Support Multicast Listener Discovery (MLDv1 and MLDv2).
+   - Add 'symmetric_l3l4' and 'symmetric_l3l4+udp' hash functions.
+   - sFlow agent now reports tunnel and MPLS structures.
+   - Added OpenFlow 1.4+ OFPT_SET_ASYNC_CONFIG and OFPT_GET_ASYNC_CONFIG
+     that allows controllers to have more precise control over OpenFlow1.4
+     asynchronous messages.
+   - New 'check-system-userspace', 'check-kmod' and 'check-kernel' Makefile
+     targets to run a new system testsuite.  These tests can be run inside
+     a Vagrant box.  See INSTALL.md for details
+   - Dropped support for GRE64 tunnel.
+   - Mark --syslog-target argument as deprecated.  It will be removed in
+     the next OVS release.
+   - Added --user option to all daemons
+   - Add support for connection tracking through the new "ct" action
+     and "ct_state"/"ct_zone"/"ct_mark"/"ct_label" match fields.  Only
+     available on Linux kernels with the connection tracking module loaded.
+   - Add experimental version of OVN.  OVN, the Open Virtual Network, is a
+     system to support virtual network abstraction.  OVN complements the
+     existing capabilities of OVS to add native support for virtual network
+     abstractions, such as virtual L2 and L3 overlays and security groups.
+
+ -- Open vSwitch team <dev at openvswitch.org>  Thu, 03 Dec 2015 23:17:44 -0700
 
 openvswitch (2.4.0-1) unstable; urgency=low
    [ Open vSwitch team ]
-- 
1.9.1