Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/75f78729 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75f78729 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75f78729 Branch: refs/heads/trunk Commit: 75f78729d41c559ddd51581ffb530226181989b7 Parents: b719cff 501f75b Author: Sam Tunnicliffe <[email protected]> Authored: Fri Jan 15 11:38:09 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Jan 15 11:38:09 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 2 +- src/java/org/apache/cassandra/index/Index.java | 21 +++++--- .../apache/cassandra/schema/IndexMetadata.java | 20 +++++-- .../apache/cassandra/index/CustomIndexTest.java | 57 ++++++++++++++++++++ 5 files changed, 88 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/75f78729/CHANGES.txt ----------------------------------------------------------------------
