Merge branch 'cassandra-3.X' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97eeb66e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97eeb66e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97eeb66e

Branch: refs/heads/trunk
Commit: 97eeb66ed39f32afbe129e9540ddb5258f0586c9
Parents: 0d813fe 90eed50
Author: Sam Tunnicliffe <s...@beobal.com>
Authored: Thu Nov 10 10:08:24 2016 +0000
Committer: Sam Tunnicliffe <s...@beobal.com>
Committed: Thu Nov 10 10:08:24 2016 +0000

----------------------------------------------------------------------
 .../io/sstable/IndexSummaryManagerTest.java     | 68 ++++++++++----------
 1 file changed, 35 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


Reply via email to