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/28b75ba3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28b75ba3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28b75ba3 Branch: refs/heads/cassandra-3.11 Commit: 28b75ba355b0d69ce09789a737df2546cd5c0954 Parents: cbc26d8 e7299c0 Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Wed Sep 13 15:01:41 2017 -0700 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Wed Sep 13 15:01:41 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/repair/RepairJob.java | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28b75ba3/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b3fb5a6,7ce298d..bc84477 --- 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: + * Don't block RepairJob execution on validation futures (CASSANDRA-13797) * Wait for all management tasks to complete before shutting down CLSM (CASSANDRA-13123) * INSERT statement fails when Tuple type is used as clustering column with default DESC order (CASSANDRA-13717) * Fix pending view mutations handling and cleanup batchlog when there are local and remote paired mutations (CASSANDRA-13069) http://git-wip-us.apache.org/repos/asf/cassandra/blob/28b75ba3/src/java/org/apache/cassandra/repair/RepairJob.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
