This is an automated email from the ASF dual-hosted git repository. domgarguilo pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 9ec0087069 Correcting error introduced when merging 2.1 branch add 528711eb17 Add metric that indicates when compactor is busy (#4622) new 000855d4c1 Merge remote-tracking branch 'upstream/2.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: .../accumulo/core/metrics/MetricsProducer.java | 27 ++++++- .../org/apache/accumulo/compactor/Compactor.java | 8 ++ .../compaction/ExternalCompactionProgressIT.java | 89 +++++++++++++--------- 3 files changed, 89 insertions(+), 35 deletions(-)