Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4faa6e12 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4faa6e12 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4faa6e12 Branch: refs/heads/trunk Commit: 4faa6e12ff22daa2c6330993825c28b433175df6 Parents: 9337ca3 fde05f4 Author: Jason Brown <jasedbr...@gmail.com> Authored: Wed Jan 10 05:09:45 2018 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Wed Jan 10 05:10:54 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4faa6e12/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7ac528c,c32e56a..1b252f5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,5 +1,18 @@@ -3.0.16 +3.11.2 + * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083) + * Avoid exposing compaction strategy index externally (CASSANDRA-14082) + * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109) + * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084) + * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948) + * Remove OpenJDK log warning (CASSANDRA-13916) + * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079) + * Cache disk boundaries (CASSANDRA-13215) + * 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: + * Set encoding for javadoc generation (CASSANDRA-14154) * Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104) * Improve commit log chain marker updating (CASSANDRA-14108) * Extra range tombstone bound creates double rows (CASSANDRA-14008) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4faa6e12/build.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org