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

[Justin Pettit]

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

diff --git a/NEWS b/NEWS
index b46fc43..f422bf8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-post-v1.11.0
+v1.12.0 - xx xxx xxxx
 ---------------------
     - OpenFlow:
       * Experimental support for OpenFlow 1.1 (in addition to 1.2 and
         1.3, which had experimental support in 1.10).
       * New support for matching outer source and destination IP address
         of tunneled packets, for tunnel ports configured with the newly
-	added "remote_ip=flow" and "local_ip=flow" options.
+        added "remote_ip=flow" and "local_ip=flow" options.
     - The Interface table in the database has a new "ifindex" column to
       report the interface's OS-assigned ifindex.
     - New "check-oftest" Makefile target for running OFTest against Open
diff --git a/configure.ac b/configure.ac
index 170a852..1e1d24f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 1.11.90, ovs-bugs at openvswitch.org)
+AC_INIT(openvswitch, 1.12.0, ovs-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 f601020..d4c7154 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,31 @@
-openvswitch (1.11.90-1) unstable; urgency=low
+openvswitch (1.12.0-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
-     - Nothing yet!  Try NEWS...
-
- -- Open vSwitch team <dev at openvswitch.org>  Mon, 29 Apr 2013 14:30:34 -0700
+    - OpenFlow:
+      * Experimental support for OpenFlow 1.1 (in addition to 1.2 and
+        1.3, which had experimental support in 1.10).
+      * New support for matching outer source and destination IP address
+        of tunneled packets, for tunnel ports configured with the newly
+        added "remote_ip=flow" and "local_ip=flow" options.
+    - The Interface table in the database has a new "ifindex" column to
+      report the interface's OS-assigned ifindex.
+    - New "check-oftest" Makefile target for running OFTest against Open
+      vSwitch.  See README-OFTest for details.
+    - The flow eviction threshold has been moved to the Open_vSwitch table.
+    - Database names are now mandatory when specifying ovsdb-server options
+      through database paths (e.g. Private key option with the database name
+      should look like "--private-key=db:Open_vSwitch,SSL,private_key").
+    - Added ovs-dev.py, a utility script helpful for Open vSwitch developers.
+
+ -- Open vSwitch team <dev at openvswitch.org>  Tue, 03 Jul 2013 15:02:34 -0700
 
 openvswitch (1.11.0-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
+    - Support for megaflows, which allows wildcarding in the kernel (and
+      any dpif implementation that supports wildcards).  Depending on
+      the flow table and switch configuration, flow set up rates are
+      close to the Linux bridge.
     - The "tutorial" directory contains a new tutorial for some advanced
       Open vSwitch features.
     - Stable bond mode has been removed.
@@ -20,13 +38,20 @@ openvswitch (1.11.0-1) unstable; urgency=low
         1.1 and later are now implemented.
       * New "stack" extension for use in actions, to push and pop from
         NXM fields.
+      * The "load" and "set_field" actions can now modify the "in_port".  (This
+        allows one to enable output to a flow's input port by setting the
+        in_port to some unused value, such as OFPP_NONE.)
     - ovs-dpctl:
       * New debugging commands "add-flow", "mod-flow", "del-flow".
+    - In dpif-based bridges, cache action translations, which can improve
+      flow set up performance by 80% with a complicated flow table.
     - New syslog format, prefixed with "ovs|", to be easier to filter.
     - RHEL: Removes the default firewall rule that allowed GRE traffic to
       pass through. Any users that relied on this automatic firewall hole
       will have to manually configure it. The ovs-ctl(8) manpage documents
       the "enable-protocol" command that can be used as an alternative.
+    - New CFM demand mode which uses data traffic to indicate interface
+      liveness.
 
  -- Open vSwitch team <dev at openvswitch.org>  Mon, 29 Apr 2013 14:30:34 -0700
 
-- 
1.7.5.4