Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7ed1905 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ed1905 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ed1905 Branch: refs/heads/trunk Commit: b7ed19059d685233c2dd2f4bdfc9a75d43029723 Parents: 9546945 7acd0e6 Author: Benedict Elliott Smith <[email protected]> Authored: Mon May 18 09:25:31 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon May 18 09:25:31 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/b7ed1905/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ----------------------------------------------------------------------
