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

[ddanielr]

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

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

commit 29a37b6c7db8e818d4868ca9dd24f60a1ac677b3
Merge: 0ce85b7a3f 163f9c3843
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Fri Jul 5 20:58:16 2024 +0000

    Merge branch 'main' into elasticity

 .../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 814ba02aa4,2c869ed058..d7efc2d5ae
--- 
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
@@@ -61,7 -60,9 +63,8 @@@ 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.github.benmanes.caffeine.cache.Caffeine;
  import com.github.benmanes.caffeine.cache.LoadingCache;
  import com.google.common.collect.HashMultimap;
  import com.google.common.collect.Multimap;