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/90b39dc6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90b39dc6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90b39dc6 Branch: refs/heads/cassandra-3.11 Commit: 90b39dc619d75096e897fb8e90dd38b04e67f848 Parents: 3f5f702 bc5c231 Author: Jeff Jirsa <[email protected]> Authored: Tue Sep 5 11:58:31 2017 -0700 Committer: Jeff Jirsa <[email protected]> Committed: Tue Sep 5 11:59:25 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/MerkleTree.java | 23 +++++++++---- .../apache/cassandra/utils/MerkleTreeTest.java | 34 ++++++++++++++++++++ 3 files changed, 51 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90b39dc6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5a53e50,4302fdf..75d9bd6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ -3.0.15 +3.11.1 + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418) + * BTree.Builder memory leak (CASSANDRA-13754) + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798) + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Change repair midpoint logging for tiny ranges (CASSANDRA-13603) * Better handle corrupt final commitlog segment (CASSANDRA-11995) * StreamingHistogram is not thread safe (CASSANDRA-13756) * Fix MV timestamp issues (CASSANDRA-11500) http://git-wip-us.apache.org/repos/asf/cassandra/blob/90b39dc6/src/java/org/apache/cassandra/utils/MerkleTree.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
