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/058e9772 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/058e9772 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/058e9772 Branch: refs/heads/trunk Commit: 058e97720258de6248ce7636989d596b9ae897be Parents: ec2c050 990f478 Author: Benedict Elliott Smith <[email protected]> Authored: Tue Feb 24 14:35:05 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Feb 24 14:35:05 2015 +0000 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/058e9772/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ----------------------------------------------------------------------
