Merge pull request #1540 from pherl/changelog
Update changes for lite
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index bb0b14f..6f1a71e 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -504,9 +504,7 @@
// assert(m0.begin()->first == m1.begin()->first); // Bug!
//
// Map's interface is similar to std::unordered_map, except that Map is not
-// designed to play well with exceptions. Mutations to a Map do not invalidate
-// a Map's iterators, pointers to elements, or references to elements. Except
-// for erase(iterator), any non-const method can reorder iterators.
+// designed to play well with exceptions.
template <typename Key, typename T>
class Map {
public:
