You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2016/12/09 18:30:08 UTC
[5/6] cassandra git commit: Merge branch 'cassandra-3.11' into
cassandra-3.X
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/599dbbc9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/599dbbc9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/599dbbc9
Branch: refs/heads/trunk
Commit: 599dbbc9fb554a17092779d73bc23e5b48760f7d
Parents: 9b09347 47d604d
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Dec 9 16:20:06 2016 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Dec 9 16:20:06 2016 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 1 +
src/java/org/apache/cassandra/config/Config.java | 12 ------------
.../cassandra/hadoop/cql3/CqlBulkRecordWriter.java | 1 -
.../apache/cassandra/net/OutboundTcpConnectionPool.java | 7 +------
5 files changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/599dbbc9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b581977,2bf1ead..4aac593
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
+3.12
+ * 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
+ * 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)
* Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)