From commits-return-21581-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Wed Mar 14 21:42:12 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5B2C318072F for ; Wed, 14 Mar 2018 21:42:12 +0100 (CET) Received: (qmail 33458 invoked by uid 500); 14 Mar 2018 20:42:11 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 33376 invoked by uid 99); 14 Mar 2018 20:42:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Mar 2018 20:42:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C4E8680937; Wed, 14 Mar 2018 20:42:10 +0000 (UTC) Date: Wed, 14 Mar 2018 20:42:13 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 01/01: Merge branch '1.8' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: ctubbsii@apache.org In-Reply-To: <152106013030.31374.12547182380320144743@gitbox.apache.org> References: <152106013030.31374.12547182380320144743@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 3c948d2a10a34db0ad805d966d190a68560d642d X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180314204210.C4E8680937@gitbox.apache.org> 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 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.