This is an automated email from the ASF dual-hosted git repository. iamaleksey pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 097505056d8720be84d7e63185d63d610c08c55b Merge: 629638b4db ef6367ed10 Author: Aleksey Yeshchenko <[email protected]> AuthorDate: Mon Jun 15 11:31:44 2026 +0100 Merge branch 'cassandra-6.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ReadCommand.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 950ed48917,a9850a4a9e..cae6a43c50 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ -6.0-alpha2 +7.0 + * 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 ReadCommand serializedSize() using incorrect epoch (CASSANDRA-21438) * Allocation improvements in ProtocolVersion, StorageProxy and MerkleTree (CASSANDRA-21199) * Don’t leave autocompaction disabled during bootstrap and replace (CASSANDRA-21236) * Make nodetool abortbootstrap more robust (CASSANDRA-21235) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
