(accumulo) 01/01: Merge remote-tracking branch 'upstream/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 bab64ca7cf35d52ecb0ccb1effef0926b0073ebb
Merge: 7cf04231f3 ff9a3f7442
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Tue Jul 23 20:29:28 2024 +0000

    Merge remote-tracking branch 'upstream/2.1'

 .../manager/ManagerClientServiceHandler.java       |  7 +++-
 .../org/apache/accumulo/test/shell/ShellIT.java    | 49 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
index 48b2bd7fba,8e3ef9e867..7bb4b1c616
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
@@@ -27,8 -28,12 +27,9 @@@ import java.io.IOException
  import java.io.InputStream;
  import java.io.OutputStream;
  import java.nio.file.Files;
 -import java.text.DateFormat;
 -import java.text.SimpleDateFormat;
  import java.time.Duration;
+ import java.util.ArrayList;
  import java.util.Arrays;
 -import java.util.Date;
  import java.util.List;
  import java.util.Map;
  import java.util.TimeZone;