[05/12] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

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

[05/12] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/Scrubber.java src/java/org/apache/cassandra/io/sstable/SSTableReader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-w

[05/12] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

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