Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70303563 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70303563 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70303563 Branch: refs/heads/cassandra-3.11 Commit: 70303563e9796ccc87581f5d41071b624872815e Parents: c7e6eee ab0e30e Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Thu Oct 4 12:56:39 2018 -0700 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Thu Oct 4 12:56:39 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../columniterator/SSTableReversedIterator.java | 40 +++++++++++++------ ...bles-legacy_ka_14803-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_tables-legacy_ka_14803-ka-1-Data.db | Bin 0 -> 16555 bytes ...gacy_tables-legacy_ka_14803-ka-1-Digest.sha1 | 1 + ...legacy_tables-legacy_ka_14803-ka-1-Filter.db | Bin 0 -> 16 bytes .../legacy_tables-legacy_ka_14803-ka-1-Index.db | Bin 0 -> 206 bytes ...cy_tables-legacy_ka_14803-ka-1-Statistics.db | Bin 0 -> 4450 bytes ...egacy_tables-legacy_ka_14803-ka-1-Summary.db | Bin 0 -> 92 bytes .../legacy_tables-legacy_ka_14803-ka-1-TOC.txt | 8 ++++ .../cassandra/io/sstable/LegacySSTableTest.java | 20 ++++++++++ 11 files changed, 59 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70303563/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dfc0eeb,3c6d3b5..0607528 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,7 @@@ +3.11.4 +Merged from 3.0: + 3.0.18 + * Reverse order reads can return incomplete results (CASSANDRA-14803) * Avoid calling iter.next() in a loop when notifying indexers about range tombstones (CASSANDRA-14794) * Fix purging semi-expired RT boundaries in reversed iterators (CASSANDRA-14672) * DESC order reads can fail to return the last Unfiltered in the partition (CASSANDRA-14766) http://git-wip-us.apache.org/repos/asf/cassandra/blob/70303563/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70303563/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
