[ovs-dev] [PATCHv2] Prepare for 1.11.0

[Justin Pettit]

Signed-off-by: Justin Pettit <jpettit at nicira.com>
---
The previous commit had a bad commit date and the version number wasn't
updated for the Debian changelog.
---
 NEWS             |    2 +-
 configure.ac     |    2 +-
 debian/changelog |   24 +++++++++++++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 98d300b..042810a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-post-v1.10.0
+v1.11.0 - xx xxx xxxx
 ---------------------
     - The "tutorial" directory contains a new tutorial for some advanced
       Open vSwitch features.
diff --git a/configure.ac b/configure.ac
index 9f42941..4c53361 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 1.10.90, ovs-bugs at openvswitch.org)
+AC_INIT(openvswitch, 1.11.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 18b0281..b8d7da0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,27 @@
-openvswitch (1.10.90-1) unstable; urgency=low
+openvswitch (1.11.0-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
-     - Nothing yet!  Try NEWS...
-
- -- Open vSwitch team <dev at openvswitch.org>  Mon, 04 Feb 2013 21:52:34 -0700
+    - The "tutorial" directory contains a new tutorial for some advanced
+      Open vSwitch features.
+    - Stable bond mode has been removed.
+    - The autopath action has been removed.
+    - New support for the data encapsulation format of the LISP tunnel
+      protocol (RFC 6830).  An external control plane or manual flow
+      setup is required for EID-to-RLOC mapping.
+    - OpenFlow:
+      * The "dec_mpls_ttl" and "set_mpls_ttl" actions from OpenFlow
+        1.1 and later are now implemented.
+      * New "stack" extension for use in actions, to push and pop from
+        NXM fields.
+    - ovs-dpctl:
+      * New debugging commands "add-flow", "mod-flow", "del-flow".
+    - 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.
+
+ -- Open vSwitch team <dev at openvswitch.org>  Mon, 29 Apr 2013 14:30:34 -0700
 
 openvswitch (1.10.0-1) unstable; urgency=low
    [ Open vSwitch team ]
-- 
1.7.5.4