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 7ed4fae7e1a9d7a7460f8a61c4c172191af51c3d
Merge: bf293fa982 b86d17c92b
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Fri Oct 2 08:26:12 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                                           | 1 +
 conf/jvm-server.options                                               | 3 +++
 src/java/org/apache/cassandra/config/CassandraRelevantProperties.java | 2 ++
 src/java/org/apache/cassandra/service/CassandraDaemon.java            | 4 +++-
 .../apache/cassandra/distributed/test/accord/AccordMetricsTest.java   | 2 ++
 test/unit/org/apache/cassandra/metrics/BatchMetricsTest.java          | 2 ++
 test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java            | 2 ++
 test/unit/org/apache/cassandra/metrics/ClientRequestMetricsTest.java  | 2 ++
 test/unit/org/apache/cassandra/metrics/KeyspaceMetricsTest.java       | 2 ++
 test/unit/org/apache/cassandra/metrics/TableMetricsTest.java          | 2 ++
 test/unit/org/apache/cassandra/metrics/TrieMemtableMetricsTest.java   | 2 ++
 11 files changed, 23 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 8943adf009,487806261d..907d66aa4e
--- 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:
+  * Do not expose system_metrics virtual keyspace by default (CASSANDRA-21720)
   * 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)


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

Reply via email to