Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9adc6d82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9adc6d82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9adc6d82 Branch: refs/heads/trunk Commit: 9adc6d82097e30bc25f218a65ed71f36d3cf0dab Parents: c227b92 a598ebe Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Feb 9 07:16:00 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Feb 9 07:16:00 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 2 +- pylib/cqlshlib/cql3handling.py | 1 - .../db/compaction/DateTieredCompactionStrategyOptions.java | 6 ++++++ 4 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adc6d82/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 86996d9,4074c66..f2e37a5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -24,13 -8,10 +24,14 @@@ Merged from 2.2.6 Merged from 2.1: * Gossiper#isEnabled is not thread safe (CASSANDRA-11116) * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113) + * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041) -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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adc6d82/doc/cql3/CQL.textile ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9adc6d82/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------
