This is an automated email from the ASF dual-hosted git repository.

bdeggleston pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 4e8bfd25ba6fba8938e4ef5aa34197e524c1c1a8
Merge: 607fae54b3 31235c4314
Author: Blake Eggleston <bl...@ultrablake.com>
AuthorDate: Fri Mar 28 14:13:42 2025 -0700

    Merge branch 'cassandra-5.0' into trunk
    
    * cassandra-5.0:
      convert legacy zero ballots to 4.1 zero value on deserialization

 CHANGES.txt                                        |   1 +
 .../org/apache/cassandra/service/paxos/Ballot.java |  15 +-
 src/java/org/apache/cassandra/utils/TimeUUID.java  |   2 +-
 .../MixedModePaxosLegacyCoordinatorTest.java       |  28 +++
 .../upgrade/MixedModePaxosTestBase.java            | 203 +++++++++++++++++++++
 .../MixedModePaxosUpgradedCoordinatorTest.java     |  28 +++
 6 files changed, 275 insertions(+), 2 deletions(-)

diff --cc CHANGES.txt
index a7dcac723c,cae9bc62b6..80eabfd705
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -188,38 -42,15 +188,39 @@@ Merged from 5.0
   * Streamline the serialized format for index status gossip messages 
(CASSANDRA-20058)
   * Batch clusterings into single SAI partition post-filtering reads 
(CASSANDRA-19497)
   * Ban the usage of "var" instead of full types in the production code 
(CASSANDRA-20038)
 - * Suppress CVE-2024-45772 from lucene-core-9.7.0.jar (CASSANDRA-20024)
 + * Suppress CVE-2024-45772, upgrade to lucene-core-9.12.0.jar 
(CASSANDRA-20024)
 + * Use SinglePartitionReadCommand for index queries that use strict filtering 
(CASSANDRA-19968)
 + * Always write local expiration time as an int to LivenessInfo digest 
(CASSANDRA-19989)
 + * Enables IAuthenticator's to return own AuthenticateMessage 
(CASSANDRA-19984)
 + * Use ParameterizedClass for all auth-related implementations 
(CASSANDRA-19946)
 + * Correct out-of-date metrics and configuration documentation for SAI 
(CASSANDRA-19898)
 + * Make configuration entries in memtable section order-independent 
(CASSANDRA-19906)
 + * Add guardrail for enabling usage of VectorType (CASSANDRA-19903)
 + * Set executable flag for shell scripts in .build directory for source 
artifact (CASSANDRA-19896)
 + * Throw ConfigurationException when commitlog_disk_access_mode is direct but 
direct IO is not supported by filesystem (CASSANDRA-19812)
 + * Memtable allocation type unslabbed_heap_buffers_logged will cause an 
assertion error for TrieMemtables and SegmentedTrieMemtables (CASSANDRA-19835)
 + * Minor improvements in Cassandra shutdown and startup logs (CASSANDRA-19818)
 + * Fix direct IO support always being evaluated to false upon the first start 
of a node (CASSANDRA-19779)
 + * Deprecate and ignore use_deterministic_table_id (CASSANDRA-19809)
 + * Prioritize built indexes in IndexStatusManager (CASSANDRA-19400)
 + * Add java.base/java.lang.reflect among opens for jvm11-client.options 
(CASSANDRA-19780)
  Merged from 4.1:
++ * 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)
   * Run audit_logging_options through santiation and validation on startup 
(CASSANDRA-20208)
   * Enforce CQL message size limit on multiframe messages (CASSANDRA-20052)
 - * Add nodetool checktokenmetadata command that checks TokenMetadata is 
insync with Gossip endpointState (CASSANDRA-18758)
 - * Equality check for Paxos.Electorate should not depend on collection types 
(CASSANDRA-19935)
 + * Fix race condition in DecayingEstimatedHistogramReservoir during rescale 
(CASSANDRA-19365)
  Merged from 4.0:
 - * Tighten up permissions in dc and authorizers (CASSANDRA-20225)
 + * Update zstd-jni to 1.5.7-2 (CASSANDRA-20453)
 + * Suppress CVE-2024-12801 (CASSANDRA-20412)
 + * Suppress CVE-2024-12798 (CASSANDRA-20408)
 + * Support null column value tombstones in FQL batch statements 
(CASSANDRA-20397)
 + * Update Zstd library to 1.5.7-1 (CASSANDRA-20367)
 + * Fix premature auto-failing of long-running repairs (CASSANDRA-20312)
 + * Fix autocompletion for role names/user names (CASSANDRA-20175)
 + * Tighten up permissions in dc and cidr authorizers (CASSANDRA-20225)
   * CBUtil serialization of UTF8 does not handle all UTF8 properly 
(CASSANDRA-20234)
   * Make hint expiry use request start time rather than timeout time for TTL 
(CASSANDRA-20014)
   * Do not attach rows and partitions to QueryCancellationChecker when already 
attached (CASSANDRA-20135)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to