Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5feeda6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5feeda6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5feeda6 Branch: refs/heads/trunk Commit: c5feeda6a968284d15f2baaf95b871fcced32284 Parents: f70c353 f51e983 Author: Sam Tunnicliffe <[email protected]> Authored: Tue Feb 2 15:44:50 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Feb 2 15:44:50 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/index/internal/keys/KeysSearcher.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5feeda6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b67fae2,ef0da4c..5119626 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -3.0.3 +3.3 + * Avoid infinite loop if owned range is smaller than number of + data dirs (CASSANDRA-11034) + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) +Merged from 3.0: + * Filter keys searcher results by target range (CASSANDRA-11104) * Fix deserialization of legacy read commands (CASSANDRA-11087) * Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102) * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5feeda6/src/java/org/apache/cassandra/index/internal/keys/KeysSearcher.java ----------------------------------------------------------------------
