Update master to reflect updates on branch-1.9

This commit updates NEWS and debian/changelog to reflect that
commit 8087f5ff (Process RARP packets with ethertype 0x8035
similar to ARP packets.) is going to be backported intto 1.9.0, so
that they should no longer be listed as post-1.9 features.

Signed-off-by: Mehak Mahajan <mmahajan@nicira.com>

diff --git a/NEWS b/NEWS
index dd2ab1e..a9b9a49 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,6 @@
 post-v1.9.0
 --------------------
-    - The data in the RARP packets can now be matched in the same way as the
-      data in ARP packets.
+
 
 v1.9.0 - xx xxx xxxx
 --------------------
@@ -61,7 +60,8 @@ v1.9.0 - xx xxx xxxx
         - Interface type "null".
         - Numeric values for reserved ports (see "ovs-ofctl" note above).
         - Tunnel Path MTU Discovery.
-
+    - The data in the RARP packets can now be matched in the same way as the
+      data in ARP packets.
 
 v1.8.0 - xx xxx xxxx
 ------------------------

diff --git a/debian/changelog b/debian/changelog
index c366623..237cf71 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,7 @@
 openvswitch (1.9.90-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
-    - The data in the RARP packets can now be matched in the same way as the
-      data in ARP packets.
+    - Nothing yet!  Try NEWS...
 
  -- Open vSwitch team <dev@openvswitch.org>  Wed, 24 Oct 2012 16:12:57 -0700
 
@@ -50,6 +49,8 @@ openvswitch (1.9.0-1) unstable; urgency=low
         - Interface type "null".
         - Numeric values for reserved ports (see "ovs-ofctl" note above).
         - Tunnel Path MTU Discovery.
+    - The data in the RARP packets can now be matched in the same way as the
+      data in ARP packets.
 
  -- Open vSwitch team <dev@openvswitch.org>  Wed, 24 Oct 2012 16:10:39 -0700