[accumulo] 01/01: Merge branch '2.1'

[ctubbsii]

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

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

commit aa442195db4db556f8c9a849d5ceb1729bded0ca
Merge: afe5654613 031b9c24b7
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed May 10 09:54:55 2023 -0400

    Merge branch '2.1'

 .../core/spi/compaction/DefaultCompactionPlanner.java  | 18 +++++++++---------
 .../spi/compaction/DefaultCompactionPlannerTest.java   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlanner.java
index 7086310b0b,4657108cc5..37b5d8d10c
--- 
a/core/src/main/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlanner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/spi/compaction/DefaultCompactionPlanner.java
@@@ -110,7 -113,9 +110,7 @@@ import edu.umd.cs.findbugs.annotations.
  
  public class DefaultCompactionPlanner implements CompactionPlanner {
  
-   public static class ExecutorConfig {
 -  private static final Logger log = 
LoggerFactory.getLogger(DefaultCompactionPlanner.class);
 -
+   private static class ExecutorConfig {
      String type;
      String name;
      String maxSize;