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

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit f8ad33ed4e363418a768551fb34464b111820453
Merge: 0d0c5695df 48d4214f6c
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Jan 30 07:30:32 2023 -0600

    Merge branch 'cassandra-3.11' into cassandra-4.0

 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc CHANGES.txt
index a035c66541,c00315d495..0658936306
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,8 +1,21 @@@
 -3.11.15
 +4.0.8
 + * Connect to listen address when own broadcast address is requested 
(CASSANDRA-18200)
 + * Add safeguard so cleanup fails when node has pending ranges 
(CASSANDRA-16418)
 + * Fix legacy clustering serialization for paging with compact storage 
(CASSANDRA-17507)
 + * Add support for python 3.11 (CASSANDRA-18088)
 + * Fix formatting of duration in cqlsh (CASSANDRA-18141)
 + * Fix sstable loading of keyspaces named snapshots or backups 
(CASSANDRA-14013)
 + * Avoid ConcurrentModificationException in STCS/DTCS/TWCS.getSSTables 
(CASSANDRA-17977)
 + * Restore internode custom tracing on 4.0's new messaging system 
(CASSANDRA-17981)
 + * Harden parsing of boolean values in CQL in PropertyDefinitions 
(CASSANDRA-17878)
 + * Fix error message about type hints (CASSANDRA-17915)
 + * Fix possible race condition on repair snapshots (CASSANDRA-17955)
 + * Fix ASM bytecode version inconsistency (CASSANDRA-17873)
 +Merged from 3.11:
   * Fix Splitter sometimes creating more splits than requested 
(CASSANDRA-18013)
  Merged from 3.0:
-  * Suppress CVE-2022-41915 (CASSANDRA-18147)
   * Introduce check for names of test classes (CASSANDRA-17964)
+  * Suppress CVE-2022-41915 (CASSANDRA-18147)
   * Suppress CVE-2021-1471, CVE-2021-3064, CVE-2021-4235 (CASSANDRA-18149)
   * Switch to snakeyaml's SafeConstructor (CASSANDRA-18150)
   * Expand build.dir property in rat targets (CASSANDRA-18183)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to