Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29390806 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29390806 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29390806 Branch: refs/heads/trunk Commit: 293908060bd8f8a94e5b6ec87dfd7aab457b4e61 Parents: a6430c8 b447ffc Author: Sam Tunnicliffe <s...@beobal.com> Authored: Mon Aug 1 12:47:43 2016 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Mon Aug 1 12:47:43 2016 +0100 ---------------------------------------------------------------------- .../io/sstable/IndexSummaryManager.java | 14 +-- .../io/sstable/IndexSummaryManagerTest.java | 95 ++++++++++++++------ 2 files changed, 74 insertions(+), 35 deletions(-) ----------------------------------------------------------------------
