Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2d04333 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2d04333 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2d04333 Branch: refs/heads/trunk Commit: f2d04333eb5af0ae96ff2c42b09a818f899d1e7a Parents: e533d5a f30629b Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 11:16:01 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 8 11:16:01 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
