[4/4] 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/io/sstable/SSTableReader.java src/java/org/apache/cassandra/tools/NodeCmd.java src/java/org/apache/cassandra/utils/IFilter.java src/java/org/apache/cassandra

[4/4] 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/25a4c9e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25a4c9e1 Diff: http://git-wip-us.apache.org/repos/asf