This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2ac701629b81ac72219f52cc5f50a470c3bbf7d1
Merge: 60ea852811 d4d858d382
Author: Jon Meredith <jonmered...@apache.org>
AuthorDate: Tue Apr 22 14:42:05 2025 -0600
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/LivenessInfo.java | 11 ++-
src/java/org/apache/cassandra/db/rows/Cells.java | 10 +++
test/unit/org/apache/cassandra/db/CellTest.java | 84 ++++++++++++++++++++++
.../org/apache/cassandra/db/LivenessInfoTest.java | 5 ++
.../org/apache/cassandra/db/rows/RowsTest.java | 54 ++++++++++++++
6 files changed, 163 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 7c69cb62b0,ddd87100ad..afb99c4d0b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,12 @@@
-4.0.18
- * Updating a column with a new TTL but same expiration time is
non-deterministic and causes repair mismatches. (CASSANDRA-20561)
+4.1.9
* Grant permission on keyspaces system_views and system_virtual_schema not
possible (CASSANDRA-20171)
+ * Fix mixed mode paxos ttl commit hang (CASSANDRA-20514)
+ * Fix paxos mixed mode infinite loop (CASSANDRA-20493)
+ * Optionally skip exception logging on invalid legacy protocol magic
exception (CASSANDRA-19483)
+ * Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202)
+ * Fix WaitQueue.Signal.awaitUninterruptibly may block forever if invoking
thread is interrupted (CASSANDRA-20084)
+Merged from 4.0:
++ * Updating a column with a new TTL but same expiration time is
non-deterministic and causes repair mismatches. (CASSANDRA-20561)
* Avoid computing prepared statement size for unprepared batches
(CASSANDRA-20556)
* Fix Dropwizard Meter causes timeouts when infrequently used
(CASSANDRA-19332)
* Update OWASP dependency checker to version 12.1.0 (CASSANDRA-20501)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
