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 c3850868720bcf7371b97b8f7b3ea0cf1ff74922
Merge: 17c69d7df3 763367fed3
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Mar 6 19:17:13 2025 +0000
Merge branch '2.1' into 3.1
.../java/org/apache/accumulo/server/AbstractServer.java | 7 +++++++
.../apache/accumulo/coordinator/CompactionCoordinator.java | 9 +++++++++
.../java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 8 ++++++++
.../main/java/org/apache/accumulo/tserver/ScanServer.java | 13 ++++++++++++-
4 files changed, 36 insertions(+), 1 deletion(-)
diff --cc
server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
index 63f7753231,4b49e88415..648b6d4ae0
---
a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
+++
b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
@@@ -101,9 -100,8 +101,10 @@@ import com.github.benmanes.caffeine.cac
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import com.google.common.collect.Sets;
+import com.google.common.net.HostAndPort;
+import com.google.common.util.concurrent.Uninterruptibles;
+ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import io.micrometer.core.instrument.Tag;
public class CompactionCoordinator extends AbstractServer implements
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index 2ebaab6fe3,19aade0113..27e3fe0d9a
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@@ -130,8 -126,9 +130,10 @@@ import com.github.benmanes.caffeine.cac
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
+import com.google.common.net.HostAndPort;
+ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
public class ScanServer extends AbstractServer
implements TabletScanClientService.Iface, TabletHostingServer,
ServerProcessService.Iface {
