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 6263fb3a64d5dcbe7deec91ca92c9f60f8673dfd
Merge: 487f59e66c 732fb758c6
Author: Blake Eggleston <bl...@ultrablake.com>
AuthorDate: Mon Jul 1 10:32:32 2024 -0700
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Use OpOrder in repairIterator to ensure we don't lose memtables mid-paxos
repair
CHANGES.txt | 1 +
.../paxos/uncommitted/PaxosUncommittedIndex.java | 28 ++++++++++++----------
2 files changed, 17 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
