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 fc36817033d5e1f56d10fc478d1d97f750715766
Merge: 03806f95e4 ed904a72f4
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Mon Apr 3 06:07:57 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
.build/dependency-check-suppressions.xml | 5 +++++
CHANGES.txt | 1 +
2 files changed, 6 insertions(+)
diff --cc CHANGES.txt
index c12983568e,d231ded448..c0a6b14f57
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,17 +1,29 @@@
-4.0.9
- * Avoid loading the preferred IP for BulkLoader streaming (CASSANDRA-18370)
- * Fix BufferPool incorrect memoryInUse when putUnusedPortion is used
(CASSANDRA-18311)
- * Improve memtable allocator accounting when updating AtomicBTreePartition
(CASSANDRA-18125)
- * Update zstd-jni to version 1.5.4-1 (CASSANDRA-18259)
- * Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
+4.1.2
+ * Return snapshots with dots in their name in nodetool listsnapshots
(CASSANDRA-18371)
+ * Fix NPE when loading snapshots and data directory is one directory from
root (CASSANDRA-18359)
+ * Do not submit hints when hinted_handoff_enabled=false (CASSANDRA-18304)
+ * Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
+ * Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
+Merged from 4.0:
Merged from 3.11:
+ * Suppress CVE-2022-45688 (CASSANDRA-18389)
-Merged from 3.0:
+Merged from 3.0:
* Save host id to system.local and flush immediately after startup
(CASSANDRA-18153)
- * Fix the ordering of sstables when running sstableupgrade tool
(CASSANDRA-18143)
- * Fix default file system error handler for disk_failure_policy die
(CASSANDRA-18294)
-4.0.8
+4.1.1
+ * Deprecate org.apache.cassandra.hadoop code (CASSANDRA-16984)
+ * Fix too early schema version change in sysem local table (CASSANDRA-18291)
+ * Fix copying of JAR of a trigger to temporary file (CASSANDRA-18264)
+ * Fix possible NoSuchFileException when removing a snapshot (CASSANDRA-18211)
+ * PaxosPrepare may add instances to the Electorate that are not in gossip
(CASSANDRA-18194)
+ * Fix PAXOS2_COMMIT_AND_PREPARE_RSP serialisation AssertionError
(CASSANDRA-18164)
+ * Streaming progress virtual table lock contention can trigger
TCP_USER_TIMEOUT and fail streaming (CASSANDRA-18110)
+ * Fix perpetual load of denylist on read in cases where denylist can never
be loaded (CASSANDRA-18116)
+Merged from 4.0:
+ * Fix BufferPool incorrect memoryInUse when putUnusedPortion is used
(CASSANDRA-18311)
+ * Improve memtable allocator accounting when updating AtomicBTreePartition
(CASSANDRA-18125)
+ * Update zstd-jni to version 1.5.4-1 (CASSANDRA-18259)
+ * Split and order IDEA workspace template VM_PARAMETERS (CASSANDRA-18242)
* Log warning message on aggregation queries without key or on multiple keys
(CASSANDRA-18219)
* Fix the output of FQL dump tool to properly separate entries
(CASSANDRA-18215)
* Add cache type information for maximum memory usage warning message
(CASSANDRA-18184)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
