This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 40dc910caa Fix trivial unused variable warnings
add dd2d40ff41 Use util code to identify root ZooKeeper path (#5120)
new 0647dfa359 Merge branch '3.1'
The 1 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:
.../core/clientImpl/RootClientTabletCacheTest.java | 23 +++----
.../core/clientImpl/ZookeeperLockCheckerTest.java | 28 ++++++---
.../MiniAccumuloClusterExistingZooKeepersTest.java | 7 ++-
.../org/apache/accumulo/server/ServerContext.java | 3 +-
.../org/apache/accumulo/server/ServerInfo.java | 3 +-
.../accumulo/server/init/ZooKeeperInitializer.java | 4 +-
.../server/security/handler/ZKPermHandler.java | 7 +--
.../server/security/handler/ZKSecurityTool.java | 5 --
.../accumulo/server/tables/TableManager.java | 11 ++--
.../server/tablets/UniqueNameAllocator.java | 2 +-
.../apache/accumulo/server/util/ChangeSecret.java | 5 +-
.../apache/accumulo/server/util/ListInstances.java | 3 +-
.../apache/accumulo/server/util/ZooKeeperMain.java | 2 +-
.../apache/accumulo/server/MockServerContext.java | 8 ++-
.../conf/ServerConfigurationFactoryTest.java | 3 +-
.../server/conf/store/PropStoreKeyTest.java | 46 +++++++-------
.../server/conf/store/impl/PropStoreEventTest.java | 3 +-
.../server/conf/store/impl/ZooPropStoreTest.java | 3 +-
.../ZooAuthenticationKeyWatcherTest.java | 3 +-
.../security/handler/ZKAuthenticatorTest.java | 13 ++--
.../org/apache/accumulo/server/util/AdminTest.java | 73 ++++++++++++----------
.../accumulo/server/util/ServiceStatusCmdTest.java | 3 +-
.../java/org/apache/accumulo/manager/Manager.java | 25 +++-----
.../manager/ManagerClientServiceHandler.java | 4 +-
.../org/apache/accumulo/manager/ManagerTime.java | 2 +-
.../accumulo/manager/recovery/RecoveryManager.java | 12 ++--
.../manager/tableOps/compact/CompactionDriver.java | 2 +-
.../manager/tableOps/delete/PreDeleteTable.java | 6 +-
.../create/PopulateZookeeperWithNamespace.java | 4 +-
.../tableOps/namespace/rename/RenameNamespace.java | 4 +-
.../manager/tableOps/rename/RenameTable.java | 4 +-
.../accumulo/manager/upgrade/Upgrader11to12.java | 2 +-
.../tableOps/compact/CompactionDriverTest.java | 39 ++++++------
.../manager/upgrade/Upgrader11to12Test.java | 47 +++++++-------
.../org/apache/accumulo/tserver/tablet/Tablet.java | 4 +-
.../org/apache/accumulo/test/ImportExportIT.java | 7 ++-
.../org/apache/accumulo/test/VolumeManagerIT.java | 16 +++--
.../apache/accumulo/test/fate/meta/MetaFateIT.java | 5 +-
.../test/fate/meta/MetaFateInterleavingIT.java | 5 +-
.../test/fate/meta/MetaFateStoreFateIT.java | 5 +-
.../accumulo/test/fate/meta/ZooMutatorIT.java | 4 +-
.../accumulo/test/functional/CloneTestIT.java | 11 ++--
.../test/functional/GarbageCollectorIT.java | 5 +-
.../apache/accumulo/test/functional/TableIT.java | 10 ++-
.../apache/accumulo/test/lock/ServiceLockIT.java | 3 +-
45 files changed, 271 insertions(+), 213 deletions(-)
