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/d9158346 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9158346 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9158346 Branch: refs/heads/cassandra-3.3 Commit: d9158346943a8728d1457ca0eb015d92cfc2fa13 Parents: 35a7194 cb21f28 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Feb 3 12:03:52 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Feb 3 12:03:52 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/Schema.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9158346/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5119626,6e313c3..2b67b90 --- 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: + * Remove double initialization of newly added tables (CASSANDRA-11027) * 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)
