This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git
from cbbc4adaf9 Merge branch 'main' into elasticity add a7167daa8f Clean up the 2.1 build a bit (#4743) new 1f7c2c2f42 Merge branch '2.1' new 8b57e322d9 Merge branch 'main' into elasticity The 2 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: assemble/pom.xml | 5 -- core/pom.xml | 30 ++++---- .../hadoopImpl/mapred/AccumuloRecordReader.java | 4 +- .../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 +- minicluster/pom.xml | 5 -- pom.xml | 11 +-- .../accumulo/server/metrics/MetricsInfoImpl.java | 4 +- .../accumulo/server/util/ServiceStatusCmd.java | 14 ++-- .../server/metrics/MetricsInfoImplTest.java | 4 +- server/compactor/pom.xml | 4 - .../src/test/resources/conf/generic_logger.xml | 87 ---------------------- .../src/test/resources/conf/monitor_logger.xml | 68 ----------------- server/monitor/pom.xml | 2 +- start/pom.xml | 1 + .../apache/accumulo/test/ClientSideIteratorIT.java | 13 ++-- .../java/org/apache/accumulo/test/PrintInfoIT.java | 4 - 16 files changed, 41 insertions(+), 219 deletions(-) delete mode 100644 server/manager/src/test/resources/conf/generic_logger.xml delete mode 100644 server/manager/src/test/resources/conf/monitor_logger.xml