[accumulo] 01/01: Merge branch '2.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 28627e67a1655a016a6c38d20591b14ed8ef67fa
Merge: 7967fdac52 c6d47d032e
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Mon Jun 12 19:26:32 2023 -0400

    Merge branch '2.1'

 .../accumulo/server/conf/util/ZooInfoViewer.java   | 100 +------
 .../accumulo/server/conf/util/ZooPropEditor.java   | 305 +++++++++++++++++++++
 .../accumulo/server/conf/util/ZooPropUtils.java    | 140 ++++++++++
 .../server/conf/util/ZooInfoViewerTest.java        |  25 --
 .../server/conf/util/ZooPropEditorTest.java        |  42 +++
 .../server/conf/util/ZooPropUtilsTest.java         |  68 +++++
 .../accumulo/test/conf/util/ZooPropEditorIT.java   | 138 ++++++++++
 .../apache/accumulo/test/start/KeywordStartIT.java |   2 +
 8 files changed, 698 insertions(+), 122 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
index 448912999f,97b75467e5..bab15197eb
--- a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java
@@@ -55,9 -55,12 +55,10 @@@ import org.apache.accumulo.monitor.Moni
  import org.apache.accumulo.monitor.MonitorExecutable;
  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;
  import org.apache.accumulo.server.util.Admin;
 -import org.apache.accumulo.server.util.ConvertConfig;
  import org.apache.accumulo.server.util.DumpZookeeper;
  import org.apache.accumulo.server.util.ECAdmin;
  import org.apache.accumulo.server.util.Info;