cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [29/30] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X
Date Wed, 11 Jan 2017 07:02:21 GMT
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/699eff07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699eff07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/699eff07

Branch: refs/heads/trunk
Commit: 699eff0716705dd27fc45443bcd6b5e3797314f7
Parents: d1d75ad b52c820
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Wed Jan 11 07:57:42 2017 +0100
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Wed Jan 11 07:57:42 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                   | 7 ++++---
 .../org/apache/cassandra/thrift/CustomTThreadPoolServer.java  | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/699eff07/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ba4172b,b8250ab..917eb5d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,3 +1,24 @@@
 +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)
@@@ -134,6 -111,6 +132,7 @@@
   * Properly report LWT contention (CASSANDRA-12626)
  Merged from 3.0:
   * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794)
++ * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620)
   * Add parent repair session id to anticompaction log message (CASSANDRA-12186)
   * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905)
@@@ -199,6 -176,9 +198,8 @@@
   * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776)
   * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
+  * Fix race causing infinite loop if Thrift server is stopped before it starts listening
(CASSANDRA-12856)
+  * CompactionTasks now correctly drops sstables out of compaction when not enough disk space
is available (CASSANDRA-12979)
 - * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix DynamicEndpointSnitch noop in multi-datacenter situations (CASSANDRA-13074)
   * cqlsh copy-from: encode column names to avoid primary key parsing errors (CASSANDRA-12909)
   * Temporarily fix bug that creates commit log when running offline tools (CASSANDRA-8616)


Mime
View raw message