cassandra-commits mailing list archives

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


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

Branch: refs/heads/trunk
Commit: b815c781a4334b5c4417a8b6a58ba857867130e0
Parents: ebb1f8d fffa6d8
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Dec 3 15:01:44 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Dec 3 15:01:44 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/b815c781/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b88c80e,507a709..f4020a0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +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)


Mime
View raw message