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/4d3f5a32 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d3f5a32 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d3f5a32 Branch: refs/heads/cassandra-3.11 Commit: 4d3f5a32b2cc821f74fbece183ededdd91d195bf Parents: 4f30dae 45937de Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Tue Sep 25 17:03:57 2018 +0100 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Tue Sep 25 17:03:57 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/UnfilteredDeserializer.java | 115 ++++++++++++------- ...bles-legacy_ka_14766-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_tables-legacy_ka_14766-ka-1-Data.db | Bin 0 -> 103 bytes ...gacy_tables-legacy_ka_14766-ka-1-Digest.sha1 | 1 + ...legacy_tables-legacy_ka_14766-ka-1-Filter.db | Bin 0 -> 16 bytes .../legacy_tables-legacy_ka_14766-ka-1-Index.db | Bin 0 -> 134 bytes ...cy_tables-legacy_ka_14766-ka-1-Statistics.db | Bin 0 -> 4450 bytes ...egacy_tables-legacy_ka_14766-ka-1-Summary.db | Bin 0 -> 92 bytes .../legacy_tables-legacy_ka_14766-ka-1-TOC.txt | 8 ++ .../cassandra/io/sstable/LegacySSTableTest.java | 27 ++++- 11 files changed, 112 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d3f5a32/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f04cae1,43628b2..a4fa705 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.18 +3.11.4 +Merged from 3.0: + * DESC order reads can fail to return the last Unfiltered in the partition (CASSANDRA-14766) * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2} messages (CASSANDRA-14568) * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages (CASSANDRA-14568) * Handle failures in parallelAllSSTableOperation (cleanup/upgradesstables/etc) (CASSANDRA-14657) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d3f5a32/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d3f5a32/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
