Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ca8052a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ca8052a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ca8052a Branch: refs/heads/trunk Commit: 5ca8052a9cb6aaf350c25c340bf03069a846f443 Parents: 89f275c a2dd005 Author: Tyler Hobbs <[email protected]> Authored: Fri May 27 12:38:14 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri May 27 12:38:14 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../io/sstable/format/SSTableReader.java | 71 +------------------- 2 files changed, 3 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ca8052a/CHANGES.txt ----------------------------------------------------------------------
