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

[ctubbsii]

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

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

commit 851e93f82939c87f97e47eb59b3544562bd0aa49
Merge: 84c916cbfe 7b746cd08f
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Tue Dec 17 12:55:01 2024 -0500

    Merge branch '2.1' into 3.1

 .../server/conf/CheckAccumuloProperties.java       | 23 ++++++++++------------
 .../apache/accumulo/test/start/KeywordStartIT.java |  2 ++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
index 07d45a0238,5579510723..e8e94146a7
--- a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
@@@ -52,8 -53,10 +52,9 @@@ import org.apache.accumulo.minicluster.
  import org.apache.accumulo.miniclusterImpl.MiniClusterExecutable;
  import org.apache.accumulo.monitor.Monitor;
  import org.apache.accumulo.monitor.MonitorExecutable;
+ import org.apache.accumulo.server.conf.CheckAccumuloProperties;
  import org.apache.accumulo.server.conf.CheckCompactionConfig;
  import org.apache.accumulo.server.conf.CheckServerConfig;
 -import org.apache.accumulo.server.conf.util.ConfigPropertyUpgrader;
  import org.apache.accumulo.server.conf.util.ZooInfoViewer;
  import org.apache.accumulo.server.conf.util.ZooPropEditor;
  import org.apache.accumulo.server.init.Initialize;
@@@ -129,8 -132,11 +130,9 @@@ public class KeywordStartIT 
      expectSet.put("admin", Admin.class);
      expectSet.put("check-compaction-config", CheckCompactionConfig.class);
      expectSet.put("check-server-config", CheckServerConfig.class);
+     expectSet.put("check-accumulo-properties", CheckAccumuloProperties.class);
      expectSet.put("compaction-coordinator", CoordinatorExecutable.class);
      expectSet.put("compactor", CompactorExecutable.class);
 -    expectSet.put("config-upgrade", ConfigPropertyUpgrader.class);
 -    expectSet.put("convert-config", ConvertConfig.class);
      expectSet.put("create-empty", CreateEmpty.class);
      expectSet.put("create-token", CreateToken.class);
      expectSet.put("dump-zoo", DumpZookeeper.class);