[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b52a686 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b52a686 Diff: http://git-wip-us.apache.org/repos/asf

[07/12] cassandra git commit: Merge branch cassandra-2.1 into cassandra-2.2

Merge branch cassandra-2.1 into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9583b6b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9583b6b3 Diff: http://git-wip-us.apache.org/repos/asf/c

[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04ef62cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ef62cb Diff: http://git-wip-us.apache.org/repos/asf

[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d0d30e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d0d30e4 Diff: http://git-wip-us.apache.org/repos/asf

[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe40a11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe40a11 Diff: http://git-wip-us.apache.org/repos/asf

[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2357589d/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 1458461,000