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/cbb3c8f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cbb3c8f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cbb3c8f4 Branch: refs/heads/trunk Commit: cbb3c8f48819d83f0713b707f93d18c75c6d9122 Parents: 574468c 9d08e50 Author: Yuki Morishita <[email protected]> Authored: Fri Apr 11 11:32:35 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri Apr 11 11:32:35 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/io/sstable/SSTableReader.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) ----------------------------------------------------------------------
