This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d0e3f0ae0a90666a1a3d3fbba2dd5eb8905a5e2f
Merge: de73759c24 25959b438c
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
AuthorDate: Fri May 5 11:01:21 2023 -0400
Merge branch '2.1'
.../core/metadata/schema/TabletMetadata.java | 10 ++
.../accumulo/server/manager/state/Assignment.java | 14 ++-
.../server/manager/state/MetaDataStateStore.java | 8 +-
.../server/manager/state/UnassignedTablet.java | 84 +++++++++++++++++
.../server/manager/state/ZooTabletStateStore.java | 8 +-
.../accumulo/server/util/ManagerMetadataUtil.java | 14 +--
.../manager/state/RootTabletStateStoreTest.java | 4 +-
.../server/util/ManagerMetadataUtilTest.java | 102 +++++++++++++++++++++
.../java/org/apache/accumulo/manager/Manager.java | 9 +-
.../accumulo/manager/TabletGroupWatcher.java | 51 ++++++-----
.../apache/accumulo/tserver/AssignmentHandler.java | 3 +-
.../accumulo/test/functional/SplitRecoveryIT.java | 2 +-
.../apache/accumulo/test/manager/MergeStateIT.java | 2 +-
.../accumulo/test/performance/NullTserver.java | 2 +-
14 files changed, 265 insertions(+), 48 deletions(-)
