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/6e97178a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e97178a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e97178a Branch: refs/heads/trunk Commit: 6e97178a50d1cc9a6817653e463ef5f0cf132873 Parents: f04b775 6658a6e Author: Yuki Morishita <[email protected]> Authored: Sat Apr 12 15:22:55 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Sat Apr 12 15:22:55 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/io/sstable/SSTableReader.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
