This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 8b57e322d94194815e6df32bac73aa627d3bd8ae
Merge: cbbc4adaf9 1f7c2c2f42
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Jul 18 15:52:30 2024 -0400
Merge branch 'main' into elasticity
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(-)
