(accumulo) 02/02: Merge branch 'main' into elasticity

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 800eecf390f07dee656edc7f9d11ba8a35b17762
Merge: ea48421dbe 5dbaec8f78
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Jul 26 08:00:54 2024 -0400

    Merge branch 'main' into elasticity

 .../java/org/apache/accumulo/core/clientImpl/ClientContext.java    | 5 +----
 .../java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java   | 7 ++-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index bee134896e,2983320c9c..07ff915c95
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@@ -24,9 -24,9 +24,8 @@@ import static com.google.common.base.Su
  import static java.nio.charset.StandardCharsets.UTF_8;
  import static java.util.concurrent.TimeUnit.MILLISECONDS;
  import static java.util.concurrent.TimeUnit.SECONDS;
 -import static 
org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
  
  import java.lang.Thread.UncaughtExceptionHandler;
- import java.lang.reflect.InvocationTargetException;
  import java.net.URL;
  import java.nio.file.Path;
  import java.util.Collection;