Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3c147f86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c147f86 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c147f86 Branch: refs/heads/trunk Commit: 3c147f865cb2284ed971dd454e0295e42005ac6f Parents: 657934f b984ea3 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Thu Mar 31 09:03:15 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Mar 31 09:03:15 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/CQLTester.java | 1 + .../apache/cassandra/index/CustomIndexTest.java | 30 ++++++++++++-------- 2 files changed, 19 insertions(+), 12 deletions(-) ----------------------------------------------------------------------