Declare the version as "1.4.0".

diff --git a/NEWS b/NEWS
index 33732ffe00ccff45622dcc924716e6f1d069b0e5..fa78da870ca1e161ce8bf45a393a46040c57cbf0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-post-v1.3.0
+v1.4.0 - xx xxx xxxx
 ------------------------
     - New "VLAN splinters" feature to work around buggy device drivers
       in old Linux versions.  (This feature is deprecated.  When

diff --git a/configure.ac b/configure.ac
index 7bac8712f8be223f00b9da3323fde53ddddc8541..60f31c3cdfee1e5db349d3000a540c7dc4ddbe55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 1.3.90, ovs-bugs@openvswitch.org)
+AC_INIT(openvswitch, 1.4.0, 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 dbeb7648afa7ba898bd837420994060a3d9bf76f..f22d927ee373b0624fb23645358636113891cd8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+openvswitch (1.4.0-1) unstable; urgency=low
+  [ Open vSwitch team ]
+  * New upstream version
+    - New "VLAN splinters" feature to work around buggy device drivers
+      in old Linux versions.  (This feature is deprecated.  When
+      broken device drivers are no longer in widespread use, we will
+      delete this feature.)  See ovs-vswitchd.conf.db(5) for more
+      information.
+    - OpenFlow:
+       - Added ability to match on IPv6 flow label through NXM.
+       - Added ability to match on ECN bits in IPv4 and IPv6 through NXM.
+       - Added ability to match on TTL in IPv4 and IPv6 through NXM.
+       - Added ability to modify ECN bits in IPv4.
+       - Added ability to modify TTL in IPv4.
+    - ovs-vswitchd:
+       - Don't require the "normal" action to use mirrors.  Traffic will
+         now be properly mirrored for any flows, regardless of their
+         actions.
+       - Track packet and byte statistics sent on mirrors.
+    - ovs-appctl:
+      - New "fdb/flush" command to flush bridge's MAC learning table.
+    - ovs-test:
+      - A new distributed testing tool that allows one to diagnose performance
+        and connectivity issues. This tool currently is not included in RH or
+        Xen packages.
+    - RHEL packaging now supports integration with Red Hat network scripts.
+
+ -- Open vSwitch team <dev@openvswitch.org>  Mon, xx xxx xxxx 23:36:00 +0000
+
 openvswitch (1.3.0-1) unstable; urgency=low
   [ Open vSwitch team ]
   * New upstream version