Revert "Prepare for 2.1.2."

This reverts commit 82e413df because bug fix bf52ed4 (datapath: Check for
backported skb_orphan_frags().) was required.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>

diff --git a/NEWS b/NEWS
index a31740e..32dc352 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,3 @@
-v2.1.2 - xx xxx xxxx
----------------------
-
-
 v2.1.1 - 28 Apr 2014
 ---------------------
    - The "ovsdbmonitor" graphical tool has been removed, because it was

diff --git a/configure.ac b/configure.ac
index af86fd5..3b9087b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.64)
-AC_INIT(openvswitch, 2.1.2, ovs-bugs@openvswitch.org)
+AC_INIT(openvswitch, 2.1.1, ovs-bugs@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 4db805c..deea337 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-openvswitch (2.1.2-1) unstable; urgency=low
-   [ Open vSwitch team ]
-   - Nothing yet!
-
- -- Open vSwitch team <dev@openvswitch.org>  Mon, 28 Apr 2014 14:51:37 -0700
-
 openvswitch (2.1.1-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version