cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Wed, 07 Dec 2016 15:49:30 GMT
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96ff08c1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96ff08c1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96ff08c1

Branch: refs/heads/trunk
Commit: 96ff08c1b23ec584583a415ec2cf9cca4968fa77
Parents: d2a92e4 7b1e2ed
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Dec 7 15:49:05 2016 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Dec 7 15:49:05 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 src/java/org/apache/cassandra/index/sasi/plan/QueryController.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/96ff08c1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 07177a4,b581977..a827294
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
 +
  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)


Mime
View raw message