(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 a4cc5f82c37b4ff1cb2bb44d99e0b7cef1302fc1
Merge: 3c4292d747 e34b439e7d
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Thu Nov 2 04:26:36 2023 +0000

    Merge branch '2.1'

 .../spi/compaction/DefaultCompactionPlanner.java   |  5 ++--
 .../test/functional/GarbageCollectorIT.java        | 34 +++++++++++++---------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 73fb6d5665,b1372ac3ad..dc9fb34174
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@@ -32,10 -31,10 +32,9 @@@ import java.time.Duration
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Iterator;
 -import java.util.LinkedList;
  import java.util.List;
  import java.util.Map.Entry;
- import java.util.Objects;
 -import java.util.concurrent.TimeUnit;
 +import java.util.Optional;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;