This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch 3.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 545eef2d835934bcff6378bf7541f0d8d47b9090 Merge: eff4a5532d 41fb8ef8f4 Author: Dave Marion <dlmar...@apache.org> AuthorDate: Mon Oct 28 14:06:40 2024 +0000 Merge branch '2.1' into 3.1 .../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(-)