This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a change to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 4182fa84c0 Merge branch '2.1' into 3.1 add 65b3fe8276 Switches to String-based migration partitioning (#5359) new 359c745c16 Merge branch '2.1' into 3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../core/manager/balancer/BalanceParamsImpl.java | 19 +- .../accumulo/core/spi/balancer/GroupBalancer.java | 10 +- .../spi/balancer/HostRegexTableLoadBalancer.java | 11 +- .../core/spi/balancer/TableLoadBalancer.java | 4 +- .../accumulo/core/spi/balancer/TabletBalancer.java | 10 +- .../core/spi/balancer/GroupBalancerTest.java | 6 +- ...tRegexTableLoadBalancerReconfigurationTest.java | 6 +- .../balancer/HostRegexTableLoadBalancerTest.java | 16 +- .../core/spi/balancer/SimpleLoadBalancerTest.java | 4 +- .../core/spi/balancer/TableLoadBalancerTest.java | 4 +- .../server/manager/state/CurrentState.java | 3 +- .../server/manager/state/MetaDataStateStore.java | 15 +- .../server/manager/state/MetaDataTableScanner.java | 15 +- .../server/manager/state/RootTabletStateStore.java | 43 ---- .../server/manager/state/TabletStateStore.java | 7 +- .../accumulo/server/util/FindOfflineTablets.java | 15 +- .../java/org/apache/accumulo/manager/Manager.java | 64 ++---- .../manager/ManagerClientServiceHandler.java | 2 +- .../org/apache/accumulo/manager/Migrations.java | 138 +++++++++++++ .../accumulo/manager/TabletGroupWatcher.java | 8 +- .../apache/accumulo/manager/state/MergeStats.java | 3 +- .../accumulo/manager/tableOps/delete/CleanUp.java | 3 +- .../apache/accumulo/manager/MigrationsTest.java | 229 +++++++++++++++++++++ .../monitor/rest/tables/TablesResource.java | 5 +- .../test/functional/AssignLocationModeIT.java | 9 +- .../test/functional/CompactLocationModeIT.java | 10 +- .../test/functional/ManagerAssignmentIT.java | 9 +- .../functional/TabletStateChangeIteratorIT.java | 9 +- .../apache/accumulo/test/manager/MergeStateIT.java | 2 +- .../accumulo/test/manager/SuspendedTabletsIT.java | 24 +-- .../accumulo/test/performance/NullTserver.java | 4 +- .../accumulo/test/ChaoticLoadBalancerTest.java | 2 +- 32 files changed, 491 insertions(+), 218 deletions(-) delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/manager/state/RootTabletStateStore.java create mode 100644 server/manager/src/main/java/org/apache/accumulo/manager/Migrations.java create mode 100644 server/manager/src/test/java/org/apache/accumulo/manager/MigrationsTest.java