This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 6c2f6873ddb521ab6f5a3a27f0984be7a9b47b41 Merge: b674b62dd9 49e1b5cd7d Author: Dave Marion <[email protected]> AuthorDate: Tue Jul 23 21:53:13 2024 +0000 Merge branch 'main' into elasticity .../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 89d9694a4f,61671b85f4..cf23158954 --- 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,9 +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.data.constraints.NoDeleteConstraint; import org.apache.accumulo.core.file.rfile.RFile;
