Merge branch 'cassandra-3.0' into cassandra-3.11 * cassandra-3.0: Fix serialized size of DataLimits
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2bc37f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2bc37f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2bc37f4 Branch: refs/heads/trunk Commit: d2bc37f43db14661a159406e421985a2484d5387 Parents: 9ee44db eb05025 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Sat Nov 18 14:17:43 2017 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Sat Nov 18 14:17:43 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/TypeSizes.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2bc37f4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a1a1a37,6c50a3f..3fc934e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ -3.0.16 +3.11.2 + * Add asm jar to build.xml for maven builds (CASSANDRA-11193) + * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897) + * 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) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
