This is an automated email from the ASF dual-hosted git repository.

smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 31b4958365ff4ddae3d3c6c41684a845989fc8be
Merge: 10a30409ac bb8eede506
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Wed Aug 12 10:58:37 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                        |  1 +
 .../apache/cassandra/cql3/PasswordObfuscator.java  | 13 +++--
 .../cassandra/cql3/PasswordObfuscatorTest.java     | 58 ++++++++++++++++++++++
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 7f4b3d5e18,9ff91c284a..11e6997cd3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -72,31 -75,6 +72,32 @@@ Merged from 6.0
   * Differentiate between legitimate cases where the first entry is the same 
as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() 
(CASSANDRA-21255)
   * Introduce minimum_threshold for data resurrection startup check 
(CASSANDRA-21293)
   * Synchronously publish changes to local gossip state following metadata 
updates (CASSANDRA-21239)
 +Merged from 5.0:
 + * Avoid rebuilding per-SSTable SAI components unless missing or corrupted 
(CASSANDRA-21515)
 + * Propagate trickle_fsync settings to compressed SSTable writers 
(CASSANDRA-21487)
 + * Allow setCompressedReadAheadBufferSizeInKb(0) to disable read-ahead buffer 
(CASSANDRA-21522)
 + * Fix ThreadLocalReadAheadBuffer#fill() to throw a CorruptBlockException if 
chunk metadata and file size are out of sync (CASSANDRA-21519)
 + * Support Python 3.12 and 3.13 in cqlsh (CASSANDRA-20997)
 + * Make synchronization on VectorMemoryIndex inserts more granular 
(CASSANDRA-21160)
 + * Fix RequestFailureReason serializer and nits in a few others 
(CASSANDRA-21437)
 + * Remove golang dependency in gen-doc and replace with python implementation 
(CASSANDRA-21432)
 + * Use estimated compressed size for tables to check if there is enough free 
space for a compaction (CASSANDRA-21245)
 + * Fix failing select on system_views.settings for non-string keys 
(CASSANDRA-21348)
 +Merged from 4.0:
++ * Fix regression in PasswordObfuscator for dollar-quoted passwords 
(CASSANDRA-21559)
 + * Do not make DNS lookup when querying system_views.clients for hostname 
column by removing it (CASSANDRA-21539)
 + * Fix memtable on-heap accounting drift in BTree.update and BTreeRow.merge 
(CASSANDRA-21472)
 + * Bound declared value length against readable bytes in CBUtil 
(CASSANDRA-21521)
 + * Verify extension type before initializing reflectively-loaded classes 
(CASSANDRA-21525)
 + * Rename conflicting nodetool import --copy-data short option from -p to -cd 
(CASSANDRA-20214)
 + * Fix PasswordObfuscator failing to obfuscate certain passwords 
(CASSANDRA-21113)
 + * Fix negative memtable allocator ownership when an update is shadowed by an 
existing row deletion (CASSANDRA-21469)
 + * Consider first token of SSTable when calculating SSTable intersection in 
LeveledScanner  (CASSANDRA-21369)
 + * Remove inFlightEcho entry on ECHO_REQ failure (CASSANDRA-21428)
 + * Validate snapshot names (CASSANDRA-21389)
 +
 +
 +6.0-alpha2
   * Change default for cassandra.set_sep_thread_name to false to reduce CPU 
usage (CASSANDRA-21089)
   * Avoid permission checks for masked columns when the table doesn't have any 
(CASSANDRA-21299)
   * Reduce allocations and array copies due to buffer resizing in 
LocalDataResponse during row serialization (CASSANDRA-21285)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to