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

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

commit d6cfa3396bb1467b7b99ffc52c8777c1bfcc6a3e
Merge: b9101d21bd f451c2b028
Author: David Capwell <[email protected]>
AuthorDate: Fri May 13 10:14:30 2022 -0700

    Merge branch 'cassandra-4.1' into trunk

 src/java/org/apache/cassandra/concurrent/ExecutionFailure.java     | 2 +-
 src/java/org/apache/cassandra/repair/RepairJob.java                | 2 +-
 .../org/apache/cassandra/distributed/impl/Instance.java            | 7 ++++---
 .../apache/cassandra/distributed/test/FailingTruncationTest.java   | 4 ++--
 .../org/apache/cassandra/distributed/test/GossipTest.java          | 2 +-
 .../test/JVMStabilityInspectorCorruptSSTableExceptionTest.java     | 2 ++
 .../distributed/test/metrics/HintsServiceMetricsTest.java          | 2 ++
 7 files changed, 13 insertions(+), 8 deletions(-)


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

Reply via email to