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 a43c0007a6c563cf29494b2ea2dd9e69dd72ce1f
Merge: 3c360aff58 2c54f9f2c9
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Oct 4 17:28:04 2024 +0000
Merge remote-tracking branch 'upstream/main'
.../core/clientImpl/ZookeeperLockChecker.java | 7 +++---
.../accumulo/core/lock/ServiceLockPaths.java | 21 +++++++++++-----
.../accumulo/core/rpc/clients/TServerClient.java | 9 +++----
.../accumulo/core/lock/ServiceLockPathsTest.java | 28 +++++++++++-----------
.../accumulo/server/manager/LiveTServerSet.java | 7 ++----
.../org/apache/accumulo/server/util/Admin.java | 5 ++--
.../accumulo/server/util/TabletServerLocks.java | 3 ++-
7 files changed, 45 insertions(+), 35 deletions(-)
