Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f90207c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f90207c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f90207c0 Branch: refs/heads/trunk Commit: f90207c0661812ad1dc6bc6d7672898406cf9ec0 Parents: 525579d a30d8bd Author: Sylvain Lebresne <[email protected]> Authored: Tue Jun 2 14:58:18 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jun 2 14:58:18 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/sstable/SSTableIdentityIterator.java | 10 ++++ .../io/sstable/format/SSTableReader.java | 57 +++++++++++++++----- .../compaction/BlacklistingCompactionsTest.java | 17 +++--- 4 files changed, 67 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f90207c0/CHANGES.txt ----------------------------------------------------------------------
