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

samt pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 8153a0b321f4f82c14098a5aac887a20ae233bd9
Merge: 194e632ab3 28759d8bbc
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Fri Nov 1 19:01:16 2024 +0000

    Merge branch 'cassandra-4.1' into cassandra-5.0

 CHANGES.txt                                        |  1 +
 .../org/apache/cassandra/service/paxos/Paxos.java  |  5 +-
 .../service/paxos/PaxosElectorateTest.java         | 55 ++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --cc CHANGES.txt
index e9ca7b0f75,bcb9dec299..a97109090c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,7 +1,8 @@@
 -4.1.8
 - * Backport Java 11 support for Simulator (CASSANDRA-17178/CASSANDRA-19935)
 +5.0.3
 + * 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)
 +Merged from 4.1:
+  * 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:
   * Add configurable batchlog endpoint strategies: random_remote, 
prefer_local, dynamic_remote, and dynamic (CASSANDRA-18120)
   * Fix bash-completion for debian distro (CASSANDRA-19999)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to