This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a3a6fc2634d2d067d4c951f441bcebb2a06ed7b0
Merge: eae367264b 33894e6997
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Mar 22 12:28:06 2024 +0000
Merge branch '2.1'
.../main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --cc
server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index 5f0cebd05a,9f37990926..0f28ecab8b
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@@ -46,7 -46,9 +46,8 @@@ import org.apache.accumulo.core.rpc.Ssl
import org.apache.accumulo.core.rpc.ThriftUtil;
import org.apache.accumulo.core.rpc.UGIAssumingTransportFactory;
import org.apache.accumulo.core.util.Halt;
-import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.core.util.Pair;
+ import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.util.threads.ThreadPools;
import org.apache.accumulo.core.util.threads.Threads;
import org.apache.accumulo.server.ServerContext;
@@@ -70,7 -72,7 +71,8 @@@ import org.apache.thrift.transport.TTra
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ import com.google.common.base.Preconditions;
+import com.google.common.net.HostAndPort;
import com.google.common.primitives.Ints;
/**
