This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from fc2a2e7dd3 Partially revert 1414641 to resurrect 2.1 upgrade code
(#3999)
add a47ee0b77d Polish up some code from recent changes (#3979)
add e34f7fe1ce Add instance name tag to metrics (#3998)
add a03d364632 Merge branch '2.1'
add 4346e744a7 Merge branch 'main' into elasticity
No new revisions were added by this update.
Summary of changes:
.../apache/accumulo/core/conf/PropertyType.java | 2 +-
.../core/metadata/schema/MetadataSchema.java | 10 ++++++
.../schema/UpgraderDeprecatedConstants.java | 40 ----------------------
.../apache/accumulo/core/metrics/MetricsUtil.java | 16 +++++----
.../accumulo/core/tabletserver/log/LogEntry.java | 4 +--
.../compaction/DefaultCompactionPlannerTest.java | 6 ++--
.../accumulo/server/AccumuloDataVersion.java | 12 ++++---
.../server/constraints/MetadataConstraints.java | 10 ++++--
.../apache/accumulo/server/ServerContextTest.java | 4 ++-
.../org/apache/accumulo/compactor/Compactor.java | 2 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 3 +-
.../java/org/apache/accumulo/manager/Manager.java | 2 +-
.../accumulo/manager/upgrade/Upgrader11to12.java | 14 ++++----
.../manager/upgrade/Upgrader11to12Test.java | 7 ++--
.../org/apache/accumulo/tserver/ScanServer.java | 2 +-
.../org/apache/accumulo/tserver/TabletServer.java | 4 +--
.../apache/accumulo/test/metrics/MetricsIT.java | 2 ++
17 files changed, 64 insertions(+), 76 deletions(-)
delete mode 100644
core/src/main/java/org/apache/accumulo/core/metadata/schema/UpgraderDeprecatedConstants.java
