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 af202bddc25969f851eadfe557c76aeb8d09754d
Merge: a3ec88632d 8fc52f5d2f
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Mon Jul 27 15:51:51 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                                 |  1 +
 .../org/apache/cassandra/config/DatabaseDescriptor.java     | 13 +++++++++++++
 src/java/org/apache/cassandra/cql3/QueryOptions.java        |  4 ++--
 .../apache/cassandra/config/DatabaseDescriptorRefTest.java  |  2 ++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index 60a69940a2,e90d69096b..4a581404cb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,12 @@@
 -6.0-alpha2
 +7.0
 + * 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:
+  * Reduce allocations in DefaultQueryOptions (CASSANDRA-21467)
 - * Coordinator load-shedding returns OverloadedException without setting 
streamId, misrouting query responses (CASSANDRA-21508)
   * Reduce number of scheduledTasks on metric id release in ThreadLocalMetrics 
(CASSANDRA-21475)
   * Cache various Enum.values() used in deserialization to avoid per-read 
array allocation (CASSANDRA-21528)
   * Fix Accord transaction error message when altering a table 
(CASSANDRA-20580)


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

Reply via email to