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:54 UTC
[18/19] 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/6459f5ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6459f5ab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6459f5ab
Branch: refs/heads/cassandra-3.X
Commit: 6459f5ab1fb24f618dd14452a4613d004da56978
Parents: 58a2930 8bbe2f5
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Dec 13 10:29:29 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Dec 13 10:29:29 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/6459f5ab/CHANGES.txt
----------------------------------------------------------------------