Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b984ea35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b984ea35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b984ea35 Branch: refs/heads/cassandra-3.5 Commit: b984ea35e93a7ea9019375a1e5e7a60002085c10 Parents: cd69d9d f8cc860 Author: Sam Tunnicliffe <[email protected]> Authored: Thu Mar 31 09:02:53 2016 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Mar 31 09:02:53 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/CQLTester.java | 1 + .../apache/cassandra/index/CustomIndexTest.java | 30 ++++++++++++-------- 2 files changed, 19 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b984ea35/test/unit/org/apache/cassandra/cql3/CQLTester.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b984ea35/test/unit/org/apache/cassandra/index/CustomIndexTest.java ----------------------------------------------------------------------
