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/03/31 10:04:44 UTC

[5/5] cassandra git commit: Merge branch 'cassandra-3.5' into trunk

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 <sa...@beobal.com>
Authored: Thu Mar 31 09:03:15 2016 +0100
Committer: Sam Tunnicliffe <sa...@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(-)
----------------------------------------------------------------------