[accumulo] branch main updated (b51bab16a2 -> 495225c891)

[ct...@apache.org]

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

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


    from b51bab16a2 Remove old (broken) shell fate test
     add 5b85dab6a2 Use Text instead of ByteBuffer for Cache key
     new 495225c891 Merge branch '2.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../server/security/handler/ZKSecurityTool.java    | 35 ++++++---
 .../security/handler/ZKSecurityToolTest.java       | 86 ++++++++++++++++++++++
 2 files changed, 109 insertions(+), 12 deletions(-)
 create mode 100644 server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKSecurityToolTest.java

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

[ct...@apache.org]

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 495225c891f334fc002d9bd6579219fbf54075db
Merge: b51bab16a2 5b85dab6a2
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Jun 7 18:08:53 2023 -0400

    Merge branch '2.1'

 .../server/security/handler/ZKSecurityTool.java    | 35 ++++++---
 .../security/handler/ZKSecurityToolTest.java       | 86 ++++++++++++++++++++++
 2 files changed, 109 insertions(+), 12 deletions(-)

diff --cc server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
index 0d2882ebd9,156d29fbdd..b3cd1371b2
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKSecurityTool.java
@@@ -25,9 -25,9 +25,8 @@@ import java.io.ByteArrayOutputStream
  import java.io.DataInputStream;
  import java.io.DataOutputStream;
  import java.io.IOException;
 +import java.io.UncheckedIOException;
- import java.nio.ByteBuffer;
  import java.security.MessageDigest;
 -import java.security.NoSuchAlgorithmException;
 -import java.security.SecureRandom;
  import java.time.Duration;
  import java.util.HashSet;
  import java.util.Set;