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/d1d75ad8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1d75ad8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1d75ad8 Branch: refs/heads/trunk Commit: d1d75ad8ce1a8e76122cee39cf8201362e63cd75 Parents: dfd8dcf e9251e1 Author: Nate McCall <zznat...@gmail.com> Authored: Tue Jan 10 16:27:47 2017 +1300 Committer: Nate McCall <zznat...@gmail.com> Committed: Tue Jan 10 16:32:39 2017 +1300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- NEWS.txt | 3 ++ .../cassandra/db/compaction/CompactionTask.java | 41 +++++++++++++++----- 3 files changed, 36 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1d75ad8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b47ba37,99f6613..ba4172b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,3 +1,26 @@@ +3.12 + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080) + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) + * 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) +Merged from 3.0: + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) - ++ * CompactionTasks now correctly drops sstables out of compaction when not enough disk space is available (CASSANDRA-12979) + 3.10 * Fixed query monitoring for range queries (CASSANDRA-13050) * Remove outboundBindAny configuration property (CASSANDRA-12673)