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

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

commit 4aab7310d2c1b822f084edb1ec854e799b21998e
Merge: 5a8779681e 0d439abe62
Author: Francisco Guerrero <[email protected]>
AuthorDate: Thu Oct 1 09:13:39 2026 -0700

    Merge branch 'cassandra-6.0' into trunk
    
    * cassandra-6.0:
      Tighten up NoSpamLogger changes after migration to Caffeine cache

 CHANGES.txt                                        |  1 +
 .../org/apache/cassandra/utils/NoSpamLogger.java   | 25 ++++++-
 .../apache/cassandra/utils/NoSpamLoggerTest.java   | 81 +++++++++++++---------
 3 files changed, 71 insertions(+), 36 deletions(-)

diff --cc CHANGES.txt
index 739815c831,e3d674a04f..64b47d1580
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 -6.0-alpha3
 +7.0
 + * Extract reusable HttpService from cloud metadata connector 
(CASSANDRA-21195)
 + * Redact hash and _hash suffixed parameters in system_views.settings 
(CASSANDRA-21686)
 + * Allow CQLSSTableWriter to specify SSTable id generator to use 
(CASSANDRA-21012)
 + * Reject LIKE patterns with a wildcard (%) anywhere other than the start or 
end (CASSANDRA-21068)
 + * Support pluggable default role initialization (CASSANDRA-21546)
 + * Add prepared statement cache stats to nodetool info (CASSANDRA-14366)
 + * Don't increment client metrics on messaging service connection unpause 
(CASSANDRA-21491)
 + * Add nodetool getreplicas (CASSANDRA-17665)
 + * Implementation of CEP-49: Hardware-accelerated compression 
(CASSANDRA-20975)
 + * Avoid using ObjectUtils.getFirstNonNull in Schema (CASSANDRA-21394)
 + * Allow nodetool garbagecollect to take a user defined list of SSTables 
(CASSANDRA-16767)
 + * Add a guardrail for misprepared statements (CASSANDRA-21139)
 +Merged from 6.0:
+  * Tighten up NoSpamLogger changes after migration to Caffeine cache 
(CASSANDRA-21721)
   * Preserve the original exception when an in-memory local response fails to 
close (CASSANDRA-21710)
   * Generate autocompletion scripts for the nodetool command during the build 
(CASSANDRA-20794)
   * Implement Zstd compression level guardrail (CASSANDRA-21021)


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

Reply via email to