[accumulo] 01/02: 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 3c7408ecf61c33d4bd59ed368e9350fec97a8896
Merge: 176fe8777f 7f19f96914
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Jan 26 12:00:53 2023 -0500

    Merge branch '2.1'

 .../org/apache/accumulo/core/conf/Property.java    |  10 ++
 .../apache/accumulo/core/conf/PropertyType.java    |   3 +
 .../accumulo/core/conf/PropertyTypeTest.java       |   6 ++
 .../server/manager/state/MetaDataStateStore.java   |  14 ++-
 .../server/manager/state/TabletStateStore.java     |   2 +-
 .../server/manager/state/ZooTabletStateStore.java  |  12 ++-
 .../accumulo/server/util/ManagerMetadataUtil.java  |  79 +++++++++++---
 .../manager/state/RootTabletStateStoreTest.java    |   9 +-
 .../accumulo/server/zookeeper/ZooAclUtilTest.java  |   4 -
 .../accumulo/manager/TabletGroupWatcher.java       |   9 ++
 .../test/functional/AssignLocationModeIT.java      | 111 +++++++++++++++++++
 .../test/functional/CompactLocationModeIT.java     | 118 +++++++++++++++++++++
 12 files changed, 352 insertions(+), 25 deletions(-)

diff --cc 
server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java
index 86e8eb96bc,0de924dfc5..90079a9bfc
--- 
a/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java
+++ 
b/server/base/src/test/java/org/apache/accumulo/server/manager/state/RootTabletStateStoreTest.java
@@@ -40,7 -41,11 +41,10 @@@ import org.apache.accumulo.core.metadat
  import org.apache.accumulo.core.metadata.schema.TabletMetadata;
  import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
  import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
 -import org.apache.accumulo.core.util.HostAndPort;
+ import org.apache.accumulo.server.MockServerContext;
+ import org.apache.accumulo.server.ServerContext;
  import org.apache.accumulo.server.metadata.TabletMutatorBase;
+ import org.easymock.EasyMock;
  import org.junit.jupiter.api.Test;
  
  import com.google.common.base.Preconditions;