You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sm...@apache.org on 2026/06/19 14:05:39 UTC
(cassandra) branch trunk updated (9977bf0327 -> 9fdc212b4b)
This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 9977bf0327 Merge branch 'cassandra-6.0' into trunk
add 22bbac9d6a Fix PasswordObfuscator failing to obfuscate certain passwords
add 2dbc2f858e Merge branch 'cassandra-4.0' into cassandra-4.1
add 1a87bf5142 Merge branch 'cassandra-4.1' into cassandra-5.0
add 1d81597fdb Merge branch 'cassandra-5.0' into cassandra-6.0
new 9fdc212b4b 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 +
.../apache/cassandra/cql3/PasswordObfuscator.java | 13 ++-
.../cassandra/cql3/PasswordObfuscatorTest.java | 125 +++++++++++++++++++++
3 files changed, 133 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 sm...@apache.org.
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 9fdc212b4b6a4037c0768dfe6812a1b620871d37
Merge: 9977bf0327 1d81597fdb
Author: Stefan Miklosovic <sm...@apache.org>
AuthorDate: Fri Jun 19 15:52:28 2026 +0200
Merge branch 'cassandra-6.0' into trunk
CHANGES.txt | 1 +
.../apache/cassandra/cql3/PasswordObfuscator.java | 13 ++-
.../cassandra/cql3/PasswordObfuscatorTest.java | 125 +++++++++++++++++++++
3 files changed, 133 insertions(+), 6 deletions(-)
diff --cc CHANGES.txt
index 7b4667e34d,735693f672..74bf8d006f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,19 -38,6 +42,20 @@@ 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:
++ * 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