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/a1b1cf64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1b1cf64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1b1cf64 Branch: refs/heads/trunk Commit: a1b1cf643ed406afda15fb02e8a2821bc2e2bef9 Parents: ce0a25f f76bfd4 Author: Benedict Elliott Smith <[email protected]> Authored: Sat May 16 10:50:15 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Sat May 16 10:50:15 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
