Repository: cassandra Updated Branches: refs/heads/trunk b7ed19059 -> 05e033d97
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a4489df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a4489df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a4489df Branch: refs/heads/trunk Commit: 6a4489df3b8549979d517a646bc70723dd859430 Parents: efc57cd 7acd0e6 Author: Benedict Elliott Smith <[email protected]> Authored: Mon May 18 09:25:24 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon May 18 09:25:24 2015 +0100 ---------------------------------------------------------------------- .../unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a4489df/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ----------------------------------------------------------------------
