This is an automated email from the ASF dual-hosted git repository. jmckenzie pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e96c20e8150fd81716d203aa40301c09db0bc04a Merge: 6cf93f3192 085765a07c Author: Josh McKenzie <[email protected]> AuthorDate: Mon Apr 3 16:18:33 2023 -0400 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java | 9 +++++---- src/java/org/apache/cassandra/utils/concurrent/Ref.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --cc src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java index e64c57a9a7,f203bd8e15..6d248742ce --- a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java @@@ -32,8 -27,10 +32,10 @@@ import java.util.concurrent.ConcurrentL import java.util.concurrent.TimeUnit; import java.util.function.Predicate; -import com.codahale.metrics.Counter; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.Runnables; + ++import com.codahale.metrics.Counter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
