[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

[benedict]

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/io/sstable/SSTableWriter.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15c92c38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15c92c38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15c92c38

Branch: refs/heads/cassandra-2.1
Commit: 15c92c386049b77ff56d9ac3cc3e9f403374f181
Parents: d6200a8 b1825e6
Author: Benedict Elliott Smith <bened...@apache.org>
Authored: Fri Feb 13 10:42:21 2015 +0000
Committer: Benedict Elliott Smith <bened...@apache.org>
Committed: Fri Feb 13 10:42:21 2015 +0000

----------------------------------------------------------------------

----------------------------------------------------------------------