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/18278e42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18278e42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18278e42 Branch: refs/heads/cassandra-3.11 Commit: 18278e42249bbb298c9a8a805b7f1604925fb138 Parents: 5cbe08b 68079e4 Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Thu Mar 29 14:00:06 2018 +0100 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Thu Mar 29 14:00:06 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hints/ChecksumMismatchException.java | 28 ++++++++++++++++++++ .../apache/cassandra/hints/HintsCatalog.java | 4 ++- .../apache/cassandra/hints/HintsDescriptor.java | 20 +++++++++++++- 4 files changed, 51 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/18278e42/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1f4ffb8,7917712..62f4345 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ -3.0.17 +3.11.3 + * Serialize empty buffer as empty string for json output format (CASSANDRA-14245) + * Allow logging implementation to be interchanged for embedded testing (CASSANDRA-13396) + * SASI tokenizer for simple delimiter based entries (CASSANDRA-14247) + * Fix Loss of digits when doing CAST from varint/bigint to decimal (CASSANDRA-14170) + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Handle incompletely written hint descriptors during startup (CASSANDRA-14080) * Handle repeat open bound from SRP in read repair (CASSANDRA-14330) * Use zero as default score in DynamicEndpointSnitch (CASSANDRA-14252) * Respect max hint window when hinting for LWT (CASSANDRA-14215) http://git-wip-us.apache.org/repos/asf/cassandra/blob/18278e42/src/java/org/apache/cassandra/hints/HintsDescriptor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hints/HintsDescriptor.java index f99f9d8,e9e1c30..00224e2 --- a/src/java/org/apache/cassandra/hints/HintsDescriptor.java +++ b/src/java/org/apache/cassandra/hints/HintsDescriptor.java @@@ -22,8 -22,8 +22,9 @@@ import java.io.IOException import java.io.RandomAccessFile; import java.nio.charset.StandardCharsets; import java.nio.file.Path; +import java.util.HashMap; import java.util.Map; + import java.util.Optional; import java.util.UUID; import java.util.regex.Pattern; import java.util.zip.CRC32; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
