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 4805123eb895e607c1acba2136bf1613f1046176
Merge: 95c6fd481a 32cfd477df
Author: Jon Meredith <jonmered...@apache.org>
AuthorDate: Tue Apr 22 16:08:20 2025 -0600
Merge branch 'cassandra-5.0' into trunk
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 d20a40bcf4,462d3ed74f..5b7cb6469c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -232,12 -36,7 +232,13 @@@ Merged from 4.1
* 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)
+ * Run audit_logging_options through santiation and validation on startup
(CASSANDRA-20208)
+ * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
+ * Fix race condition in DecayingEstimatedHistogramReservoir during rescale
(CASSANDRA-19365)
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)
* Suppress CVE-2025-25193 (CASSANDRA-20504)
* Include in source tree and build packages a Snyk policy file that lists
known false positives (CASSANDRA-20319)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
