This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 607fae54b3 Merge branch 'cassandra-5.0' into trunk
add 2a5749f203 convert legacy zero ballots to 4.1 zero value on
deserialization
add 31235c4314 Merge branch 'cassandra-4.1' into cassandra-5.0
new 4e8bfd25ba Merge branch 'cassandra-5.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
.../org/apache/cassandra/service/paxos/Ballot.java | 15 +-
src/java/org/apache/cassandra/utils/TimeUUID.java | 2 +-
.../MixedModePaxosLegacyCoordinatorTest.java} | 6 +-
.../upgrade/MixedModePaxosTestBase.java | 203 +++++++++++++++++++++
.../MixedModePaxosUpgradedCoordinatorTest.java} | 6 +-
6 files changed, 225 insertions(+), 8 deletions(-)
copy test/{unit/org/apache/cassandra/db/tries/InMemoryTrieApplyTest.java =>
distributed/org/apache/cassandra/distributed/upgrade/MixedModePaxosLegacyCoordinatorTest.java}
(83%)
create mode 100644
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModePaxosTestBase.java
copy
test/distributed/org/apache/cassandra/distributed/{test/ReadRepairEmptyRangeTombstonesWithFlushesTest.java
=> upgrade/MixedModePaxosUpgradedCoordinatorTest.java} (82%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
