This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from dc3a448af3 Merge branch '2.1'
add 6e4698f186 Changes to upgrade framework for 4.0 (#5383)
No new revisions were added by this update.
Summary of changes:
.../accumulo/core/lock/ServiceLockPaths.java | 4 +-
.../apache/accumulo/server/util/UpgradeUtil.java | 276 +++++++++++++++++----
.../server/util}/upgrade/PreUpgradeValidation.java | 2 +-
.../server/util}/upgrade/UpgradeProgress.java | 2 +-
.../util}/upgrade/UpgradeProgressTracker.java | 59 +++--
.../java/org/apache/accumulo/manager/Manager.java | 3 +-
.../manager/upgrade/UpgradeCoordinator.java | 25 +-
.../manager/upgrade/UpgradeProgressTest.java | 1 +
.../apache/accumulo/test/upgrade/UpgradeIT.java | 152 ++++++++++++
.../test/upgrade/UpgradeProgressTrackerIT.java | 28 ++-
.../accumulo/test/upgrade/UpgradeUtilIT.java | 214 +++++++++++++++-
11 files changed, 661 insertions(+), 105 deletions(-)
rename server/{manager/src/main/java/org/apache/accumulo/manager =>
base/src/main/java/org/apache/accumulo/server/util}/upgrade/PreUpgradeValidation.java
(98%)
rename server/{manager/src/main/java/org/apache/accumulo/manager =>
base/src/main/java/org/apache/accumulo/server/util}/upgrade/UpgradeProgress.java
(97%)
rename server/{manager/src/main/java/org/apache/accumulo/manager =>
base/src/main/java/org/apache/accumulo/server/util}/upgrade/UpgradeProgressTracker.java
(79%)
create mode 100644
test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeIT.java
