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

[ddanielr]

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

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

commit 163f9c384378ce3fada62b275eec6b1afda6a2cb
Merge: 0b8ddf9745 69cbe71c51
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Fri Jul 5 20:55:14 2024 +0000

    Merge branch '2.1'

 .../accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java | 10 ++++++++--
 .../src/main/java/org/apache/accumulo/manager/Manager.java     |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
index a2dca45aae,040a9bc49f..2c869ed058
--- 
a/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java
@@@ -23,6 -22,8 +23,7 @@@ import static org.apache.accumulo.core.
  
  import java.net.InetAddress;
  import java.net.UnknownHostException;
 -import java.security.SecureRandom;
+ import java.time.Duration;
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Collections;
@@@ -58,9 -60,11 +60,10 @@@ import org.apache.commons.lang3.builder
  import org.apache.commons.lang3.builder.ToStringStyle;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
+ import org.slf4j.event.Level;
  
 -import com.google.common.cache.CacheBuilder;
 -import com.google.common.cache.CacheLoader;
 -import com.google.common.cache.LoadingCache;
 +import com.github.benmanes.caffeine.cache.Caffeine;
 +import com.github.benmanes.caffeine.cache.LoadingCache;
  import com.google.common.collect.HashMultimap;
  import com.google.common.collect.Multimap;