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 b9b18aa5a2a1f6ddafc45193ed1c36e9417e093e Merge: 6c96e2fd41 7377e16121 Author: Brandon Williams <brandonwilli...@apache.org> AuthorDate: Mon Jan 23 06:57:09 2023 -0600 Merge branch 'cassandra-4.0' into cassandra-4.1 .build/dependency-check-suppressions.xml | 1 + CHANGES.txt | 1 + 2 files changed, 2 insertions(+) diff --cc CHANGES.txt index 340ba11ea5,baae04c3de..a0d64b0fc0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -9,8 -5,14 +9,9 @@@ 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-41881 (CASSANDRA-18148) * Default role is created with zero timestamp (CASSANDRA-12525) * Suppress CVE-2021-37533 (CASSANDRA-18146) * Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira (CASSANDRA-18126) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org