You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/12/13 10:37:55 UTC
[19/19] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
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/b02dec3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b02dec3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b02dec3d
Branch: refs/heads/trunk
Commit: b02dec3da539d181544cfb0288102d6073f36264
Parents: 4881d9c 6459f5a
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Dec 13 10:32:57 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Dec 13 10:32:57 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/jvm.options | 5 +
src/java/org/apache/cassandra/db/Keyspace.java | 23 ----
.../cassandra/index/SecondaryIndexManager.java | 109 ++++++++++++----
.../internal/CollatedViewIndexBuilder.java | 3 +-
.../apache/cassandra/index/CustomIndexTest.java | 130 ++++++++++++++++++-
6 files changed, 222 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b02dec3d/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b02dec3d/conf/jvm.options
----------------------------------------------------------------------