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/225232a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/225232a9
Diff:
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/b3e6a433
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3e6a433
Diff:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63dacf7/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
--
diff --cc
src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java
index
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/d526536f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d526536f
Diff:
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/e2723a40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2723a40
Diff: