(accumulo) 01/01: Merge branch '2.1'

[dlmarion]

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

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

commit 49e1b5cd7da930c7ff9d317ea65d2ed00c7741cf
Merge: bab64ca7cf e97f5886b8
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Jul 23 21:46:36 2024 +0000

    Merge branch '2.1'

 .../apache/accumulo/core/conf/AccumuloConfiguration.java    |  7 +++++++
 .../apache/accumulo/core/conf/ConfigurationTypeHelper.java  |  5 +++--
 .../main/java/org/apache/accumulo/core/conf/Property.java   |  4 ++++
 .../org/apache/accumulo/server/conf/TableConfiguration.java | 13 +++++--------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index ba65025f1d,20f9849b65..61671b85f4
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -25,9 -25,12 +25,10 @@@ import java.util.Arrays
  import java.util.EnumSet;
  import java.util.HashMap;
  import java.util.HashSet;
+ import java.util.Objects;
  import java.util.function.Predicate;
  
 -import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.classloader.ClassLoaderUtil;
 -import org.apache.accumulo.core.client.security.tokens.PasswordToken;
  import org.apache.accumulo.core.data.constraints.NoDeleteConstraint;
  import org.apache.accumulo.core.file.rfile.RFile;
  import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;