Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5dbc04b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5dbc04b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5dbc04b Branch: refs/heads/trunk Commit: b5dbc04bda0479367d89d1e406b09fa187bf7aad Parents: 0b16546 19e329e Author: Marcus Eriksson <[email protected]> Authored: Tue Apr 10 15:28:29 2018 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Apr 10 15:28:29 2018 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/CorruptSSTableException.java | 4 ++-- .../cassandra/io/sstable/format/SSTableReader.java | 11 +++-------- 3 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5dbc04b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5dbc04b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
