This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d739ab6ad9a2888bf3ae8c1af76db133f97e2a46
Merge: 8fc9ff9daf e510e84a66
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Dec 23 13:37:31 2024 +0000
Merge branch '2.1' into 3.1
.../org/apache/accumulo/tserver/log/TabletServerLogger.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index a5f6963da3,a124c634f3..2aa1e87aa8
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -41,11 -39,8 +41,12 @@@ import java.util.concurrent.locks.Reent
import org.apache.accumulo.core.client.Durability;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.dataImpl.KeyExtent;
-import org.apache.accumulo.core.fate.zookeeper.ServiceLock;
-import org.apache.accumulo.core.protobuf.ProtobufUtil;
+import org.apache.accumulo.core.file.blockfile.impl.BasicCacheProvider;
+import org.apache.accumulo.core.file.blockfile.impl.CacheProvider;
++import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.logging.LoggingBlockCache;
+import org.apache.accumulo.core.spi.cache.CacheType;
+import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.util.Halt;
import org.apache.accumulo.core.util.Retry;
import org.apache.accumulo.core.util.Retry.RetryFactory;
