This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4c13df58cb3c5bea102b3a026a60574763d4dafd
Merge: 2208235ce9 cd9bed0aea
Author: Jon Meredith <jonmered...@apache.org>
AuthorDate: Fri Apr 21 10:47:59 2023 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
.../org/apache/cassandra/db/compaction/CompactionStrategyManager.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 852e4f9c91,35a0fc16d6..1c9a38a6aa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,15 +1,14 @@@
-4.0.10
+4.1.2
+ * Allow keystore and trustrore passwords to be nullable (CASSANDRA-18124)
+ * 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:
+ * Deadlock updating sstable metadata if disk boundaries need reloading
(CASSANDRA-18443)
* Fix nested selection of reversed collections (CASSANDRA-17913)
-
-4.0.9
* Update zstd-jni library to version 1.5.5 (CASSANDRA-18429)
- * Backport CASSANDRA-17205 to 4.0 branch - Remove self-reference in
SSTableTidier (CASSANDRA-18332)
- * 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)
Merged from 3.11:
* Fix sstable_count metric missing from tablestats json/yaml output
(CASSANDRA-18448)
* Suppress CVE-2022-45688 (CASSANDRA-18389)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
