cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Date Thu, 03 Dec 2015 14:02:37 GMT
Merge branch 'cassandra-3.1' into trunk


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

Branch: refs/heads/trunk
Commit: 4f5845eb5a08b8dd38b02f42d980b50837ba62e8
Parents: 0cb117c b815c78
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Dec 3 15:02:25 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Dec 3 15:02:25 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 NEWS.txt                                        |  3 +
 src/java/org/apache/cassandra/index/Index.java  | 20 +++---
 .../cassandra/index/SecondaryIndexManager.java  | 65 +++++++++-----------
 .../index/internal/CassandraIndex.java          | 26 +++++---
 .../org/apache/cassandra/index/StubIndex.java   |  6 +-
 .../index/internal/CustomCassandraIndex.java    | 10 ++-
 7 files changed, 62 insertions(+), 69 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 636ebef,f4020a0..e990837
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,6 +1,20 @@@
 +3.2
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.1
  Merged from 3.0:
+  * Remove unclear Indexer.indexes() method (CASSANDRA-10690)
   * Fix NPE on stream read error (CASSANDRA-10771)
   * Normalize cqlsh DESC output (CASSANDRA-10431)
   * Rejects partition range deletions when columns are specified (CASSANDRA-10739)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/src/java/org/apache/cassandra/index/Index.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/src/java/org/apache/cassandra/index/internal/CassandraIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/test/unit/org/apache/cassandra/index/StubIndex.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5845eb/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java
----------------------------------------------------------------------


Mime
View raw message