This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f18ffe1b97615b19b76a41a19d8a616015f5c0fe
Merge: 561e3dc757 f8ad33ed4e
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Jan 30 07:30:54 2023 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc CHANGES.txt
index b690b5c3ec,0658936306..7495517f37
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -12,10 -7,15 +12,10 @@@ Merged from 4.0
* 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
