Merge branch 'cassandra-3.11' into trunk

* cassandra-3.11: Fix serialized size of DataLimits
apache · Nov 18, 2017 · da41015 · da41015
2 parents f1f6ed6 + d2bc37f
commit da41015
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -165,6 +165,7 @@
  * Update jackson JSON jars (CASSANDRA-13949)
  * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
 Merged from 3.0:
+ * Fix serialized size of DataLimits (CASSANDRA-14057)
  * Add flag to allow dropping oversized read repair mutations (CASSANDRA-13975)
  * Fix SSTableLoader logger message (CASSANDRA-14003)
  * Fix repair race that caused gossip to block (CASSANDRA-13849)