This is an automated email from the ASF dual-hosted git repository.
benedict pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8468d33a31346a49123873019aa3f18efe6f4247
Merge: 6fcaed8fd6 067121da63
Author: Benedict Elliott Smith <bened...@apache.org>
AuthorDate: Tue Jul 12 12:29:12 2022 +0100
Merge branch 'cassandra-4.1' into trunk
.circleci/config-2_1.yml | 43 ++++++++
.circleci/config.yml | 113 +++++++++++++++++++++
.circleci/config.yml.HIGHRES | 113 +++++++++++++++++++++
.circleci/config.yml.LOWRES | 113 +++++++++++++++++++++
.circleci/config.yml.MIDRES | 113 +++++++++++++++++++++
build.xml | 9 +-
.../cassandra/concurrent/ExecutorFactory.java | 13 ++-
.../db/memtable/AbstractAllocatorMemtable.java | 2 +-
.../apache/cassandra/io/util/ChecksumWriter.java | 15 ++-
.../cassandra/service/paxos/PaxosPrepare.java | 2 +-
.../cassandra/distributed/impl/Instance.java | 2 +-
.../simulator/cluster/ClusterActionListener.java | 38 +++++++
.../simulator/cluster/ClusterActions.java | 12 +++
.../apache/cassandra/simulator/paxos/Ballots.java | 9 +-
.../simulator/paxos/PaxosRepairValidator.java | 3 +-
.../paxos/PaxosTopologyChangeVerifier.java | 3 +-
.../cassandra/simulator/utils/KindOfSequence.java | 4 +-
.../test/ClassWithSynchronizedMethods.java | 4 +
.../simulator/test/ShortPaxosSimulationTest.java | 14 +--
.../simulator/test/TrivialSimulationTest.java | 10 +-
20 files changed, 607 insertions(+), 28 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
