accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/01: Merge branch '1.8'
Date Wed, 14 Mar 2018 20:42:13 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 3c948d2a10a34db0ad805d966d190a68560d642d
Merge: dce8c35 1335249
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Wed Mar 14 16:28:53 2018 -0400

    Merge branch '1.8'

 .../core/client/impl/TableOperationsImpl.java      |   7 +-
 .../java/org/apache/accumulo/fate/util/Retry.java  | 357 +++++++++++++++++++++
 .../org/apache/accumulo/fate/zookeeper/Retry.java  | 211 ------------
 .../accumulo/fate/zookeeper/RetryFactory.java      |  74 -----
 .../apache/accumulo/fate/zookeeper/ZooReader.java  |  20 +-
 .../accumulo/fate/zookeeper/ZooReaderWriter.java   |   7 +-
 .../apache/accumulo/fate/zookeeper/ZooUtil.java    |  30 +-
 .../org/apache/accumulo/fate/util/RetryTest.java   | 294 +++++++++++++++++
 .../accumulo/fate/zookeeper/RetryFactoryTest.java  |  53 ---
 .../apache/accumulo/fate/zookeeper/RetryTest.java  | 180 -----------
 .../fate/zookeeper/ZooReaderWriterTest.java        |   4 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  15 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |  10 +-
 13 files changed, 706 insertions(+), 556 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index 0f1b598,b3de313..8e65a02
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@@ -19,7 -19,8 +19,9 @@@ package org.apache.accumulo.core.client
  import static com.google.common.base.Preconditions.checkArgument;
  import static java.nio.charset.StandardCharsets.UTF_8;
  import static java.util.Objects.requireNonNull;
+ import static java.util.concurrent.TimeUnit.MILLISECONDS;
+ import static java.util.concurrent.TimeUnit.SECONDS;
 +import static java.util.stream.Collectors.toSet;
  import static org.apache.accumulo.fate.util.UtilWaitThread.sleepUninterruptibly;
  
  import java.io.BufferedReader;

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.

Mime
View raw message