You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2023/04/03 20:29:32 UTC
[cassandra] branch trunk updated (6cf93f3192 -> e96c20e815)
This is an automated email from the ASF dual-hosted git repository.
jmckenzie pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 6cf93f3192 Merge branch 'cassandra-4.1' into trunk
new f6fce7ab51 Improve debuggability and correctness of ref detection
new 085765a07c Merge branch 'cassandra-4.0' into cassandra-4.1
new e96c20e815 Merge branch 'cassandra-4.1' into trunk
The 3 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 | 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(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.1' into trunk
Posted by jm...@apache.org.
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 <jm...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org