Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d30540f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d30540f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d30540f Branch: refs/heads/cassandra-3.0 Commit: 0d30540f6a93d4ee711a629d622efdf0c02315ef Parents: 15092e6 029b22e Author: Aleksey Yeschenko <[email protected]> Authored: Mon Feb 8 15:53:36 2016 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Feb 8 15:53:36 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d30540f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 03a8bc8,770c394..c6111e5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,8 +1,12 @@@ -2.2.6 +3.0.4 + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120) + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062) + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001) - Merged from 2.2.6 ++Merged from 2.2.6: * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030) - * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) + * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010) Merged from 2.1: + * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
