Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57e1a265
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57e1a265
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57e1a265
Branch: refs/heads/trunk
Commit: 57e1a26547abc2bf68d6fad1287eae6a262e64d7
Parents: 7f16166 2057a34
Author: Benedict Elliott Smith <bened...@apache.org>
Authored: Fri Apr 3 23:02:29 2015 +0100
Committer: Benedict Elliott Smith <bened...@apache.org>
Committed: Fri Apr 3 23:02:29 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
