From 034867f762f7a41a58836c9a2b0e7d816affb49d Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Fri, 13 May 2016 16:16:14 -0700
Subject: [PATCH] Update changelogs for C++ maps

---
 CHANGES.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 5c6b6d1013..bce03f0a6f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,7 +5,12 @@
     type.googleapis.com
 
   C++ (Beta)
-  * Improved hash maps. TODO(gpike)
+  * Improved hash maps.
+      - Improved hash maps comments. In particular, please note that equal hash
+        maps will not necessarily have the same iteration order and
+        serialization.
+      - Added a new hash maps implementation that will become the default in a
+        later release.
   * Arenas
       - Several inlined methods in Arena were moved to out-of-line to improve
         build performance and code size.