Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A3A1A200D06 for ; Mon, 25 Sep 2017 18:26:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A21CE1609EB; Mon, 25 Sep 2017 16:26:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DE0C31609C4 for ; Mon, 25 Sep 2017 18:26:33 +0200 (CEST) Received: (qmail 35645 invoked by uid 500); 25 Sep 2017 16:26:33 -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 35566 invoked by uid 99); 25 Sep 2017 16:26:33 -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; Mon, 25 Sep 2017 16:26:33 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8F46B816D4; Mon, 25 Sep 2017 16:26:29 +0000 (UTC) Date: Mon, 25 Sep 2017 16:26:33 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] 04/04: Merge branch '1.7' into 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: mmiller@apache.org Reply-To: "commits@accumulo.apache.org" In-Reply-To: <150635678938.809.3527076471534018667@gitbox.apache.org> References: <150635678938.809.3527076471534018667@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/1.8 X-Git-Reftype: branch X-Git-Rev: 8fdfb3d6b2fb533bb2eccd6291e3aa7bced7f7ec X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20170925162630.8F46B816D4@gitbox.apache.org> archived-at: Mon, 25 Sep 2017 16:26:34 -0000 This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch 1.8 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 8fdfb3d6b2fb533bb2eccd6291e3aa7bced7f7ec Merge: b95db79 2962878 Author: Mike Miller AuthorDate: Mon Sep 25 12:16:31 2017 -0400 Merge branch '1.7' into 1.8 .../java/org/apache/accumulo/fate/util/UtilWaitThread.java | 10 ++++++++++ .../org/apache/accumulo/minicluster/MiniAccumuloRunner.java | 2 +- proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@accumulo.apache.org" .