Merged from trunk
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/solr4470@1570467 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 9b83c00..1aa3224 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -272,6 +272,10 @@
* LUCENE-5447: StandardTokenizer should break at consecutive chars matching
Word_Break = MidLetter, MidNum and/or MidNumLet (Steve Rowe)
+
+* LUCENE-5462: RamUsageEstimator.sizeOf(Object) is not used anymore to
+ estimate memory usage of segments. This used to make
+ SegmentReader.ramBytesUsed very CPU-intensive. (Adrien Grand)
API Changes
