From e2c1cff8d308f27fd68951ab84af480836baa096 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Sat, 27 Feb 2016 17:57:24 +0100
Subject: [PATCH] Update CHANGES and RELEASE_NOTES

---
 CHANGES.html  | 1 +
 RELEASE_NOTES | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGES.html b/CHANGES.html
index 9d6df8421..d203e3645 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -56,6 +56,7 @@ us a note on ns-developers mailing list.</p>
 <ul>
   <li> In 'src/internet/test', a new environment is created to test TCP properties.</li>
   <li> In 'src/wifi', a new helper (WifiMacHelper) is added and is a merged helper from all previously existing MAC helpers (NqosWifiMacHelper, QosWifiMacHelper, HtWifiMacHelper and VhtWifiMacHelper).</li>
+  <li> It is now possible to use RIPv2 in IPv4 network simulations.</li>
 </ul>
 <h2>Changes to existing API:</h2>
 <ul>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index bae84c33e..b8134ce8b 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -51,6 +51,7 @@ New user-visible features
   in DCE to allow the generation of pcap directly readable by wireshark.
 - (internet) It is now possible to set custom values for RipNg Link Down (standard is 16).
 - (internet) permanent (static) NDISC entries can be created for IPv6
+- (internet) IPv4 RIPv2 protocol is now available.
 
 Bugs fixed
 ----------
@@ -102,14 +103,17 @@ Bugs fixed
 - Bug 2272 - SixLowPan NetDevice can not send uncompressed packets larger than 802.15.4 MTU
 - Bug 2273 - WeakEs model should be enforced in Static and Global routing
 - Bug 2279 - Ipv[4,6]L3Protocol::GetInterfaceForDevice speedup.
+- Bug 2283 - Add capability to use pcap trace files with nanosecond precision timestamps
 - Bug 2286 - Support for SLL header (de)serialization.
 - Bug 2287 - FlowMonitor is confused by IP over IP.
 - Bug 2288 - Ipv4 broadcast and multicast packets are replicated on all the interfaces.
+- Bug 2289 - RIP v2 implementation
 - Bug 2292 - Uninitialized variables since commit 7c60a9f8f271
 - Bug 2293 - Red Queue Estimator spins when trying to compute queue average size under long idle times.
 - Bug 2297 - 802.11n/ac networks are not compatible with legacy clients
 - Bug 2302 - Fixing RTT calculation inside TCP Socket
 - Bug 2303 - WifiMacQueue::GetSize should cleanup queue beforehand
+- Bug 2304 - DSCP Set/Get are using 8 bit values instead of 6
 - Bug 2307 - m_receivedAtLeastOneMpdu is not always reset
 
 Known issues