This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 6d94f545b6 Fix flaky CompactionJobQueuesTest (#5017) add 41fb8ef8f4 Disabled metric collection when GENERAL_MICROMETER_ENABLED is false (#4993) add 545eef2d83 Merge branch '2.1' into 3.1 add 6caf60587b Merge branch '3.1' No new revisions were added by this update. Summary of changes: .../org/apache/accumulo/core/conf/Property.java | 7 ++- .../accumulo/server/metrics/MetricsInfoImpl.java | 57 +++++++++++++--------- .../tserver/TabletServerResourceManager.java | 2 +- 3 files changed, 40 insertions(+), 26 deletions(-)