This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 82e9891610b985edce604cebcc65dbf9029be3c1
Merge: daabd6945b 4a62e8161b
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu May 29 16:47:15 2025 +0000
Merge branch '2.1'
assemble/conf/accumulo-env.sh | 1 +
assemble/conf/log4j2-service.properties | 1 -
assemble/conf/log4j2.properties | 1 -
core/src/test/resources/log4j2-test.properties | 1 -
hadoop-mapreduce/src/test/resources/log4j2-test.properties | 1 -
iterator-test-harness/src/test/resources/log4j2-test.properties | 1 -
minicluster/src/test/resources/log4j2-test.properties | 1 -
server/base/src/test/resources/log4j2-test.properties | 1 -
server/gc/src/test/resources/log4j2-test.properties | 1 -
server/manager/src/test/resources/log4j2-test.properties | 1 -
server/monitor/src/test/resources/log4j2-test.properties | 1 -
server/tserver/src/test/resources/log4j2-test.properties | 1 -
shell/src/test/resources/log4j2-test.properties | 1 -
start/src/test/resources/log4j2-test.properties | 1 -
test/src/main/resources/log4j2-test.properties | 1 -
15 files changed, 1 insertion(+), 14 deletions(-)
