Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ad6dc9a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ad6dc9a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ad6dc9a Branch: refs/heads/trunk Commit: 8ad6dc9af3e569a22bce178827aca93de3bdc352 Parents: 40424ee 70d0d5f Author: T Jake Luciani <j...@apache.org> Authored: Thu Jun 18 14:50:17 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Thu Jun 18 14:50:17 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/format/SSTableReader.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ad6dc9a/CHANGES.txt ----------------------------------------------------------------------