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 552adf2e1efef005eaa187caeb6bdbc4dc186ea1
Merge: 6c2f6873dd d54b4e57bc
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Jul 24 00:24:04 2024 -0400

    Merge branch 'main' into elasticity

 assemble/pom.xml                                   |  1 +
 core/pom.xml                                       | 30 ++++----
 .../core/client/admin/ActiveCompaction.java        |  2 +-
 .../core/metrics/MeterRegistryFactory.java         | 30 --------
 .../core/security/ColumnVisibilityTest.java        | 83 ++++++++++++----------
 minicluster/pom.xml                                |  7 ++
 .../server/compaction/RetryableThriftCall.java     |  2 -
 .../accumulo/server/metrics/MetricsInfoImpl.java   | 24 ++-----
 .../server/metrics/MetricsInfoImplTest.java        | 17 -----
 .../accumulo/tserver/session/SessionManager.java   |  6 +-
 start/pom.xml                                      |  6 --
 test/pom.xml                                       | 10 +--
 .../accumulo/test/functional/CompactionIT.java     | 31 --------
 13 files changed, 81 insertions(+), 168 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index e110786f15,3e69c84897..1a2a313ee0
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@@ -24,10 -23,11 +24,9 @@@ import static java.util.stream.Collecto
  import static org.junit.jupiter.api.Assertions.assertEquals;
  import static org.junit.jupiter.api.Assertions.assertFalse;
  import static org.junit.jupiter.api.Assertions.assertNotNull;
 -import static org.junit.jupiter.api.Assertions.assertThrows;
  import static org.junit.jupiter.api.Assertions.assertTrue;
 -import static org.junit.jupiter.api.Assertions.fail;
  
  import java.io.IOException;
- import java.io.UncheckedIOException;
  import java.nio.file.FileVisitResult;
  import java.nio.file.Files;
  import java.nio.file.Paths;

Reply via email to