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 7666b19ac6c509f48abef7ce17789a8903196b05
Merge: 0840eb35af 564d30ad8e
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Fri Jul 24 23:23:02 2026 +0200

    Merge branch 'cassandra-6.0' into trunk

 CHANGES.txt                                                             | 1 +
 .../apache/cassandra/cql3/statements/schema/AlterTableStatement.java    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index b35ff548b2,46e8b5fc1e..d2bf6142c9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 -6.0-alpha2
 +7.0
 + * 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:
+  * Fix Accord transaction error message when altering a table 
(CASSANDRA-20580)
   * 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)


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

Reply via email to