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

[ctubbsii]

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

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

commit ea48421dbee71c7812ec4baa52356285e784129a
Merge: fc084cf9ef 3ee04b18b3
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Jul 26 00:27:16 2024 -0400

    Merge branch 'main' into elasticity

 .../java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
index a7c666ee9c,ca54665742..8c04b63358
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
@@@ -18,7 -18,8 +18,8 @@@
   */
  package org.apache.accumulo.test.functional;
  
 +import static 
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP1;
+ import static 
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.MAX_DATA;
 -import static 
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.QUEUE1;
  import static 
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.compact;
  import static 
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.createTable;
  import static 
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.verify;