(accumulo) branch main updated (2ebcd968ef -> 5a1086fa54)

[kr...@apache.org]

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

krathbun pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from 2ebcd968ef Created hashCode JUnit tests for data classes (#5717)
     add 9811a053da Improve readability of logIfFixed (#5737)
     new 5a1086fa54 Merge branch '2.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:
 .../main/java/org/apache/accumulo/server/util/SystemPropUtil.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(accumulo) 01/01: Merge branch '2.1'

[kr...@apache.org]

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

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

commit 5a1086fa541b1ea82d58567fa68f866c78344ef7
Merge: 2ebcd968ef 9811a053da
Author: Kevin Rathbun <ke...@gmail.com>
AuthorDate: Mon Jul 14 09:28:00 2025 -0400

    Merge branch '2.1'

 .../main/java/org/apache/accumulo/server/util/SystemPropUtil.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --cc server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
index 977beb7297,1adc07a53c..bd3b35ef6c
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
@@@ -63,9 -63,9 +63,9 @@@ public class SystemPropUtil 
      removePropWithoutDeprecationWarning(context, resolved);
    }
  
 -  private static void removePropWithoutDeprecationWarning(ServerContext context, String property) {
 +  public static void removePropWithoutDeprecationWarning(ServerContext context, String property) {
-     logIfFixed(property, null);
+     logIfFixed(Property.getPropertyByKey(property), null);
 -    context.getPropStore().removeProperties(SystemPropKey.of(context), List.of(property));
 +    context.getPropStore().removeProperties(SystemPropKey.of(), List.of(property));
    }
  
    private static String validateSystemProperty(ServerContext context, SystemPropKey key,