This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 07bf1bc6fd Merge branch 'main' into elasticity add e682a2f229 Fix test failures after metrics merge (#4500) new 03d3a6d911 Merge remote-tracking branch 'upstream/main' into elasticity 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: .../java/org/apache/accumulo/core/metrics/MetricsProducer.java | 4 ++-- .../monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 1 + .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 2 +- .../org/apache/accumulo/test/functional/MemoryStarvedScanIT.java | 7 +++++-- .../java/org/apache/accumulo/test/functional/ZombieTServer.java | 7 +++++++ 5 files changed, 16 insertions(+), 5 deletions(-)