(accumulo) 01/01: Merge branch 'main' into elasticity

[kturner]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 696030e5064410d6ac2a52e4f787d0e32e97520c
Merge: 9a7af44338 97f2f624ee
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Jul 22 16:34:57 2024 -0400

    Merge branch 'main' into elasticity

 core/src/main/java/org/apache/accumulo/core/Constants.java       | 4 ----
 .../java/org/apache/accumulo/core/security/Authorizations.java   | 5 +----
 .../java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java | 9 ++++++++-
 .../org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java  | 5 +++++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/Constants.java
index a06675f846,411af753cf..1cda91318c
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@@ -77,10 -76,10 +75,8 @@@ public class Constants 
    public static final String ZDEAD = "/dead";
    public static final String ZDEADTSERVERS = ZDEAD + "/tservers";
  
-   public static final String ZTRACERS = "/tracers";
- 
    public static final String ZPROBLEMS = "/problems";
  
 -  public static final String BULK_ARBITRATOR_TYPE = "bulkTx";
 -
    public static final String ZFATE = "/fate";
  
    public static final String ZNEXT_FILE = "/next_file";