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

[ctubbsii]

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 47966e4fc48e7e2818b5ae1ebe87c0040198e652
Merge: 88e10aa31d 851e93f829
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Tue Dec 17 13:00:06 2024 -0500

    Merge branch '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 2f7a08c7b2,e8e94146a7..f5835fafe3
--- a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
@@@ -128,6 -130,8 +129,7 @@@ 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("create-empty", CreateEmpty.class);
      expectSet.put("create-token", CreateToken.class);