From commits-return-22967-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Fri Jun 7 17:24:17 2019 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id ED171180763 for ; Fri, 7 Jun 2019 19:24:16 +0200 (CEST) Received: (qmail 19263 invoked by uid 500); 7 Jun 2019 17:24:16 -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 19250 invoked by uid 99); 7 Jun 2019 17:24:16 -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; Fri, 07 Jun 2019 17:24:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id B607787A69; Fri, 7 Jun 2019 17:24:12 +0000 (UTC) Date: Fri, 07 Jun 2019 17:24:12 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch 2.0 updated: Resolve bad merge of #1185 by removing unused import MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155992825263.16177.17772298060702536418@gitbox.apache.org> From: ctubbsii@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/2.0 X-Git-Reftype: branch X-Git-Oldrev: df55b1a40a8e891f9a15430c31a6bfbba3f20bf6 X-Git-Newrev: 55e5e95fe11924c957f955ec4a7d83cdc1ac42f5 X-Git-Rev: 55e5e95fe11924c957f955ec4a7d83cdc1ac42f5 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.0 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/2.0 by this push: new 55e5e95 Resolve bad merge of #1185 by removing unused import 55e5e95 is described below commit 55e5e95fe11924c957f955ec4a7d83cdc1ac42f5 Author: Christopher Tubbs AuthorDate: Fri Jun 7 13:21:09 2019 -0400 Resolve bad merge of #1185 by removing unused import --- core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java index 0bddb07..598248c 100644 --- a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java +++ b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReader.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.accumulo.fate.util.Retry; import org.apache.accumulo.fate.util.Retry.RetryFactory; -import org.apache.accumulo.fate.zookeeper.ZooUtil.ZooKeeperConnectionInfo; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.Code; import org.apache.zookeeper.Watcher;