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

[ctubbsii]

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

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

commit 77fd0df3e06d4dc4c9695ecd07b47f1fd18abb17
Merge: 8ffe4cbecb de0bb39ebc
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Tue Sep 23 22:35:28 2025 -0400

    Merge branch '2.1'

 .../org/apache/accumulo/test/VolumeChooserIT.java  | 49 ++++------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
index cc6a341fdc,b56c330fe0..437bf47c00
--- a/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/VolumeChooserIT.java
@@@ -19,9 -19,10 +19,9 @@@
  package org.apache.accumulo.test;
  
  import static org.junit.jupiter.api.Assertions.assertEquals;
+ import static org.junit.jupiter.api.Assertions.assertFalse;
  import static org.junit.jupiter.api.Assertions.assertTrue;
- import static org.junit.jupiter.api.Assertions.fail;
  
 -import java.io.File;
  import java.time.Duration;
  import java.util.ArrayList;
  import java.util.Collections;
@@@ -44,10 -45,9 +44,9 @@@ import org.apache.accumulo.core.data.Mu
  import org.apache.accumulo.core.data.Range;
  import org.apache.accumulo.core.data.TableId;
  import org.apache.accumulo.core.data.Value;
 -import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.SystemTables;
  import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
- import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
  import org.apache.accumulo.core.security.Authorizations;
  import org.apache.accumulo.core.spi.fs.DelegatingChooser;
  import org.apache.accumulo.core.spi.fs.PreferredVolumeChooser;