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

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

commit 1008be681a9770f8aa16e15f131e10de6b26588b
Merge: 3c254d5161 b6954a7a39
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Tue Jun 11 17:26:42 2024 -0400

    Merge branch 'main' into elasticity

 .../accumulo/core/client/ConditionalWriter.java    |  2 +-
 .../core/clientImpl/ConditionalWriterImpl.java     | 11 ++-
 .../accumulo/tserver/TabletClientHandler.java      | 56 ++++++++-----
 .../apache/accumulo/test/WriteAfterCloseIT.java    | 95 ++++++++++++++--------
 .../compaction/ExternalCompactionProgressIT.java   |  6 +-
 5 files changed, 107 insertions(+), 63 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
index bf650a077f,3137a19f00..bec607cb28
--- 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ConditionalWriterImpl.java
@@@ -89,8 -91,10 +91,10 @@@ import org.slf4j.LoggerFactory
  
  import com.google.common.net.HostAndPort;
  
 -class ConditionalWriterImpl implements ConditionalWriter {
 +public class ConditionalWriterImpl implements ConditionalWriter {
  
+   private static final Logger log = 
LoggerFactory.getLogger(ConditionalWriterImpl.class);
+ 
    private static final int MAX_SLEEP = 30000;
  
    private Authorizations auths;

Reply via email to