You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mm...@apache.org on 2026/06/19 20:52:55 UTC
(cassandra) branch trunk updated (4ea936b2c7 -> 1b37872410)
This is an automated email from the ASF dual-hosted git repository.
Mmuzaf pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 4ea936b2c7 Merge branch 'cassandra-6.0' into trunk
add bd835726f2 Rename conflicting nodetool import --copy-data short option from -p to -cd
add 95088443ff Merge branch 'cassandra-4.0' into cassandra-4.1
add 3fa111c70f Merge branch 'cassandra-4.1' into cassandra-5.0
add d1212e8017 Merge branch 'cassandra-5.0' into cassandra-6.0
new 1b37872410 Merge branch 'cassandra-6.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
test/unit/org/apache/cassandra/db/ImportTest.java | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-6.0' into trunk
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
Mmuzaf pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 1b37872410e5be4453b7e4e1d7deed1096799779
Merge: 4ea936b2c7 d1212e8017
Author: Maxim Muzafarov <mm...@apache.org>
AuthorDate: Fri Jun 19 22:25:31 2026 +0200
Merge branch 'cassandra-6.0' into trunk
* cassandra-6.0:
Rename conflicting nodetool import --copy-data short option from -p to -cd
CHANGES.txt | 1 +
test/unit/org/apache/cassandra/db/ImportTest.java | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --cc CHANGES.txt
index eb9d884f88,4dbb5c2691..3d60231178
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -44,20 -39,6 +44,21 @@@ Merged from 6.0
* Differentiate between legitimate cases where the first entry is the same as the last entry and empty bounds in SSTableCursorWriter#addIndexBlock() (CASSANDRA-21255)
* Introduce minimum_threshold for data resurrection startup check (CASSANDRA-21293)
* Synchronously publish changes to local gossip state following metadata updates (CASSANDRA-21239)
+Merged from 5.0:
+ * Fix RequestFailureReason serializer and nits in a few others (CASSANDRA-21437)
+ * Remove golang dependency in gen-doc and replace with python implementation (CASSANDRA-21432)
+ * Use estimated compressed size for tables to check if there is enough free space for a compaction (CASSANDRA-21245)
+ * Fix failing select on system_views.settings for non-string keys (CASSANDRA-21348)
+Merged from 4.0:
++ * Rename conflicting nodetool import --copy-data short option from -p to -cd (CASSANDRA-20214)
+ * Fix PasswordObfuscator failing to obfuscate certain passwords (CASSANDRA-21113)
+ * Fix negative memtable allocator ownership when an update is shadowed by an existing row deletion (CASSANDRA-21469)
+ * Consider first token of SSTable when calculating SSTable intersection in LeveledScanner (CASSANDRA-21369)
+ * Remove inFlightEcho entry on ECHO_REQ failure (CASSANDRA-21428)
+ * Validate snapshot names (CASSANDRA-21389)
+
+
+6.0-alpha2
* Change default for cassandra.set_sep_thread_name to false to reduce CPU usage (CASSANDRA-21089)
* Avoid permission checks for masked columns when the table doesn't have any (CASSANDRA-21299)
* Reduce allocations and array copies due to buffer resizing in LocalDataResponse during row serialization (CASSANDRA-21285)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org