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

[dlmarion]

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 d5e5c5880bbd06fcd2d5bbe525885e4dbc65106c
Merge: 7f7cf05c92 8bac964fba
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Feb 13 15:19:54 2025 +0000

    Merge branch '3.1'

 core/src/main/java/org/apache/accumulo/core/cli/ConfigOpts.java  | 5 ++++-
 .../test/java/org/apache/accumulo/core/cli/ConfigOptsTest.java   | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --cc core/src/test/java/org/apache/accumulo/core/cli/ConfigOptsTest.java
index b5a38dec3b,8e0b7b7c47..5e71cf26c9
--- a/core/src/test/java/org/apache/accumulo/core/cli/ConfigOptsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/cli/ConfigOptsTest.java
@@@ -56,4 -56,13 +56,13 @@@ public class ConfigOptsTest 
      assertEquals("test:123", 
opts.getSiteConfiguration().get(Property.INSTANCE_ZK_HOST));
    }
  
+   @Test
+   public void testOverrideMultiple() {
+     opts.parseArgs(ConfigOptsTest.class.getName(),
+         new String[] {"-o", Property.GENERAL_PROCESS_BIND_ADDRESS.getKey() + 
"=1.2.3.4", "-o",
 -            Property.COMPACTOR_QUEUE_NAME.getKey() + "=test"});
++            Property.COMPACTOR_GROUP_NAME.getKey() + "=test"});
+     assertEquals("1.2.3.4", 
opts.getSiteConfiguration().get(Property.GENERAL_PROCESS_BIND_ADDRESS));
 -    assertEquals("test", 
opts.getSiteConfiguration().get(Property.COMPACTOR_QUEUE_NAME));
++    assertEquals("test", 
opts.getSiteConfiguration().get(Property.COMPACTOR_GROUP_NAME));
+   }
+ 
  }