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

[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 18327450eea962eecfb638bf7b52c54e649d0556
Merge: a7aca3325d 819a0cefb7
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Dec 21 14:27:22 2023 -0500

    Merge branch '2.1'

 .../src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 632e20e7c2,1f56568486..91e9382b71
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@@ -56,8 -56,6 +56,7 @@@ import org.apache.accumulo.core.spi.cry
  import org.apache.accumulo.core.spi.crypto.CryptoService;
  import org.apache.accumulo.core.spi.crypto.FileDecrypter;
  import org.apache.accumulo.core.spi.crypto.FileEncrypter;
- import org.apache.accumulo.core.spi.crypto.NoCryptoService;
 +import org.apache.accumulo.core.tabletserver.log.LogEntry;
  import org.apache.accumulo.core.util.Pair;
  import org.apache.accumulo.core.util.threads.Threads;
  import org.apache.accumulo.server.ServerContext;