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 0ac3c55d65f81dae917547c377f5505938d7e653
Merge: c9968a8e95 ac8ddfb321
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Tue Jan 17 09:58:59 2023 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
.build/dependency-check-suppressions.xml | 17 +++++++++++++++++
CHANGES.txt | 1 +
2 files changed, 18 insertions(+)
diff --cc CHANGES.txt
index 017e5748b9,0f2d9e9812..5b0da3ae7d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -5,8 -2,14 +5,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-2021-37533 (CASSANDRA-18146)
* Add to the IntelliJ Git Window issue navigation links to Cassandra's Jira
(CASSANDRA-18126)
* Avoid anticompaction mixing data from two different time windows with TWCS
(CASSANDRA-17970)
* Do not spam the logs with MigrationCoordinator not being able to pull
schemas (CASSANDRA-18096)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
