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/a7125d2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7125d2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7125d2a Branch: refs/heads/cassandra-3.3 Commit: a7125d2a2af02e68de53fa0e6b01383daac27140 Parents: 30d3b29 c83d108 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Feb 2 14:20:33 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Feb 2 14:20:33 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/sstable/metadata/MetadataCollector.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7125d2a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bad296b,da6f5cc..2600d56 --- 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: + * Avoid memory leak when collecting sstable metadata (CASSANDRA-11026) * Mutations do not block for completion under view lock contention (CASSANDRA-10779) * Invalidate legacy schema tables when unloading them (CASSANDRA-11071) * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
