This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from a41366bbd2 Merge remote-tracking branch 'upstream/2.1' add 5d5339559d Fix ZombieTServer metrics in for LateLastContactIT failure (#4527) new d46ef7cdc6 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: .../server/metrics/NoOpDistributionSummary.java | 83 ++++++++++++++++++++++ .../accumulo/server/metrics/ThriftMetrics.java | 4 +- .../metrics/NoOpDistributionSummaryTest.java | 19 ++--- .../accumulo/server/metrics/ThriftMetricsTest.java | 62 ++++++++++++++++ .../tserver/metrics/TabletServerScanMetrics.java | 5 +- .../tserver/metrics/TabletServerUpdateMetrics.java | 3 +- .../accumulo/test/functional/ZombieTServer.java | 8 +-- 7 files changed, 166 insertions(+), 18 deletions(-) create mode 100644 server/base/src/main/java/org/apache/accumulo/server/metrics/NoOpDistributionSummary.java copy core/src/test/java/org/apache/accumulo/core/client/lexicoder/DateLexicoderTest.java => server/base/src/test/java/org/apache/accumulo/server/metrics/NoOpDistributionSummaryTest.java (64%) create mode 100644 server/base/src/test/java/org/apache/accumulo/server/metrics/ThriftMetricsTest.java