(accumulo) 01/01: Merge branch '2.1'

[kturner]

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

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

commit 7baa5c76abe1dc459d6d554bd5d19cf35c899756
Merge: 861d28b64b d4e2ae729a
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon May 13 10:48:03 2024 -0400

    Merge branch '2.1'

 .../main/java/org/apache/accumulo/core/clientImpl/ClientContext.java  | 4 ++--
 .../apache/accumulo/core/spi/scan/ConfigurableScanServerSelector.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index acc06022e8,e4ba0028c9..093aa7f04e
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@@ -19,8 -19,10 +19,9 @@@
  package org.apache.accumulo.core.clientImpl;
  
  import static com.google.common.base.Preconditions.checkArgument;
+ import static com.google.common.base.Suppliers.memoize;
  import static com.google.common.base.Suppliers.memoizeWithExpiration;
  import static java.nio.charset.StandardCharsets.UTF_8;
 -import static java.util.Objects.requireNonNull;
  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;