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 e56b58732c6674e74fac8a259a272bb8f3487a09
Merge: 4ddbe3f72b 2397d52df7
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Fri Jul 10 11:16:12 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 .build/cassandra-deps-maven-pom.xml | 16 ++++++++++++++++
 .build/parent-maven-pom.xml         | 19 +++++++++++++++++++
 CHANGES.txt                         |  1 +
 ide/nbproject/project.xml           |  2 +-
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index 04ab37acf0,55f62c138b..04e62e29b0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -6.0-alpha2
 +7.0
 + * 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:
+  * Depend only on platform-specific Zstd JNI native libraries 
(CASSANDRA-21483)
   * Expose immediately-executed tasks in the queries virtual table 
(CASSANDRA-21471)
   * Avoid potential deadlock between GlobalLogFollower and GossipStage 
(CASSANDRA-21384)
   * Add CMS membership as a field in ClusterMetadata (CASSANDRA-20736)


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

Reply via email to