Merge branch 'cameron/12765-3.X' into cameron/12765-trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e15fc37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e15fc37 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e15fc37 Branch: refs/heads/trunk Commit: 2e15fc37ff47f404afbbefc8be9a9109ca0a2492 Parents: 456c028 575927b Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Oct 21 09:10:14 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Oct 21 09:10:14 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../db/SinglePartitionReadCommand.java | 3 +- .../io/sstable/format/SSTableReader.java | 2 +- .../db/SinglePartitionReadCommandCQLTest.java | 41 ++++++++++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e15fc37/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1e9bc7d,105791b..bd355ef --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -148,7 -140,8 +148,9 @@@ Merged from 2.2 * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) * Fail repair on non-existing table (CASSANDRA-12279) * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + * Better handle invalid system roles table (CASSANDRA-12700) + Merged from 2.1: + * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765) 3.8, 3.9 http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e15fc37/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ----------------------------------------------------------------------
