Merge branch 'cassandra-3.11' into cassandra-3.X
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc16ff11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc16ff11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc16ff11 Branch: refs/heads/cassandra-3.X Commit: cc16ff11cab4d20420e865079e0b2536652e00de Parents: 0d4fdad 84b1725 Author: Stefania Alborghetti <[email protected]> Authored: Fri Dec 23 09:41:38 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Fri Dec 23 09:41:38 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ReadCommand.java | 40 ++++++++++++-------- .../db/SinglePartitionReadCommand.java | 4 +- .../apache/cassandra/db/filter/RowFilter.java | 11 +++++- .../db/RepairedDataTombstonesTest.java | 8 ++-- 5 files changed, 42 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc16ff11/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 69293bb,0c215a2..4cb3c45 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +3.12 + * Allow IN restrictions on column families with collections (CASSANDRA-12654) + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) + * Add mutation size and batch metrics (CASSANDRA-12649) + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * Expose time spent waiting in thread pool queue (CASSANDRA-8398) + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) + * Add support for arithmetic operators (CASSANDRA-11935) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + + 3.10 + * Fixed query monitoring for range queries (CASSANDRA-13050) * Remove outboundBindAny configuration property (CASSANDRA-12673) * Use correct bounds for all-data range when filtering (CASSANDRA-12666) * Remove timing window in test case (CASSANDRA-12875)
