This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from b8089dd528 Add a merge column marker to make merge idempotent (#3957)
add e57df50bdd fixes bug with compaction preemption (#3961)
add af53242538 Replaces java constant name with value in metrics javadocs
(#3956)
new 90821b115c Merge branch '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 | 150 ++++++++++-----------
.../accumulo/tserver/tablet/CompactableImpl.java | 11 +-
.../tablet/CompactableImplFileManagerTest.java | 34 +++++
3 files changed, 117 insertions(+), 78 deletions(-)
