Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5860efa9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5860efa9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5860efa9 Branch: refs/heads/trunk Commit: 5860efa9ad3ebfbe83c60b821c51c26a7821b806 Parents: e0dce5f 5ffae4f Author: Sam Tunnicliffe <[email protected]> Authored: Fri Oct 2 18:10:10 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Oct 2 18:10:10 2015 +0100 ---------------------------------------------------------------------- NEWS.txt | 4 +- .../restrictions/CustomIndexExpression.java | 6 +- .../restrictions/StatementRestrictions.java | 7 +- .../cassandra/index/SecondaryIndexManager.java | 6 +- .../apache/cassandra/index/CustomIndexTest.java | 75 ++++++++++++++++++++ 5 files changed, 91 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
