This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch single-node-props
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f336894433838332e31aacb0ab9c0c1d386ec099
Merge: c8505dfde1 ba244f6515
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Apr 28 15:48:51 2022 -0400
Merge branch 'main' into single-node-props
.../accumulo/core/client/IsolatedScanner.java | 1 -
.../accumulo/core/conf/DefaultConfiguration.java | 9 +-
.../accumulo/core/conf/SiteConfiguration.java | 10 +-
.../org/apache/accumulo/core/trace/TraceUtil.java | 20 +--
.../core/client/rfile/RFileClientTest.java | 7 +-
.../accumulo/core/conf/SiteConfigurationTest.java | 8 +-
...tRegexTableLoadBalancerReconfigurationTest.java | 2 +-
.../balancer/HostRegexTableLoadBalancerTest.java | 2 +-
.../hadoop/its/mapred/AccumuloOutputFormatIT.java | 25 ++--
.../accumulo/hadoop/its/mapred/TokenFileIT.java | 25 ++--
.../its/mapreduce/AccumuloOutputFormatIT.java | 26 ++--
.../accumulo/hadoop/its/mapreduce/TokenFileIT.java | 25 ++--
.../accumulo/iteratortest/IteratorTestBase.java | 2 -
.../org/apache/accumulo/server/ServerContext.java | 122 ++++++----------
.../server/conf/ServerConfigurationFactory.java | 155 ++++++---------------
.../server/security/AuditedSecurityOperation.java | 4 +-
.../apache/accumulo/server/ServerContextTest.java | 58 +++++---
.../conf/ServerConfigurationFactoryTest.java | 30 ++--
.../BaseHostRegexTableLoadBalancerTest.java | 2 +-
.../server/security/SystemCredentialsTest.java | 2 +-
.../coordinator/CompactionCoordinator.java | 3 +-
.../org/apache/accumulo/compactor/Compactor.java | 1 -
.../accumulo/gc/SimpleGarbageCollectorTest.java | 2 +-
.../java/org/apache/accumulo/manager/Manager.java | 3 -
.../accumulo/manager/upgrade/Upgrader9to10.java | 2 -
.../accumulo/monitor/resources/js/functions.js | 10 ++
.../apache/accumulo/monitor/resources/js/server.js | 126 ++++++-----------
.../apache/accumulo/monitor/templates/server.ftl | 15 +-
.../org/apache/accumulo/tserver/TabletServer.java | 5 -
.../org/apache/accumulo/shell/ShellOptionsJC.java | 23 ++-
.../accumulo/shell/commands/TraceCommand.java | 56 +++++---
.../org/apache/accumulo/test/AuditMessageIT.java | 14 +-
.../apache/accumulo/test/ConditionalWriterIT.java | 9 +-
.../org/apache/accumulo/test/ExistingMacIT.java | 15 +-
.../accumulo/test/IsolationAndDeepCopyIT.java | 13 +-
.../org/apache/accumulo/test/SplitRecoveryIT.java | 4 +-
.../accumulo/test/functional/BigRootTabletIT.java | 4 +-
.../accumulo/test/functional/ClassLoaderIT.java | 13 +-
.../accumulo/test/functional/CombinerIT.java | 13 +-
.../accumulo/test/functional/CreateAndUseIT.java | 8 +-
.../test/functional/DeleteEverythingIT.java | 14 +-
.../accumulo/test/functional/DeleteRowsIT.java | 4 +-
.../test/functional/GarbageCollectorIT.java | 7 +-
.../accumulo/test/functional/KerberosIT.java | 6 +-
.../accumulo/test/functional/MetadataIT.java | 20 +--
.../accumulo/test/functional/RowDeleteIT.java | 41 +++---
.../apache/accumulo/test/functional/TableIT.java | 6 +-
.../accumulo/test/functional/TooManyDeletesIT.java | 2 -
.../test/functional/ZookeeperRestartIT.java | 12 +-
.../test/mapred/AccumuloOutputFormatIT.java | 11 +-
.../apache/accumulo/test/mapred/TokenFileIT.java | 11 +-
.../test/mapreduce/AccumuloOutputFormatIT.java | 12 +-
.../accumulo/test/mapreduce/TokenFileIT.java | 23 ++-
53 files changed, 417 insertions(+), 626 deletions(-)
