This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 53357dadfbb0578f0cb6cea7fd11c88212b07817
Merge: 1b4e1cc ae58620
Author: Mick Semb Wever <[email protected]>
AuthorDate: Wed Jan 20 16:38:53 2021 +0100

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt         |   1 +
 lib/jflex-1.6.0.jar | Bin 1048690 -> 1048692 bytes
 2 files changed, 1 insertion(+)

diff --cc CHANGES.txt
index 3430527,75c3f73..1c63268
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,8 +1,14 @@@
 -3.11.10
 - * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
 +4.0-beta5
 + * Correct memtable on-heap size calculations to match actual use 
(CASSANDRA-16318)
 + * Fix client notifications in CQL protocol v5 (CASSANDRA-16353)
 + * Too defensive check when picking sstables for preview repair 
(CASSANDRA-16284)
 + * Ensure pre-negotiation native protocol responses have correct stream id 
(CASSANDRA-16376)
 + * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
 + * SSLFactory should initialize SSLContext before setting protocols 
(CASSANDRA-16362)
 + * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees, 
in the cassandra-all pom (CASSANDRA-16303)
   * Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
 - * Rate limit validation compactions using compaction_throughput_mb_per_sec 
(CASSANDRA-16161)
 - * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to 
default of 1GB (CASSANDRA-16071)
 +Merged from 3.11:
++ * Update jflex-1.6.0.jar to match upstream (CASSANDRA-16393)
  Merged from 3.0:
   * Prevent unbounded number of pending flushing tasks (CASSANDRA-16261)
   * Improve empty hint file handling during startup (CASSANDRA-16162)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to