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 F3EF8200B6C for ; Sun, 14 Aug 2016 05:03:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F14B2160AB7; Sun, 14 Aug 2016 03:03:37 +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 38F0A160AB2 for ; Sun, 14 Aug 2016 05:03:37 +0200 (CEST) Received: (qmail 4370 invoked by uid 500); 14 Aug 2016 03:03:36 -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 4351 invoked by uid 99); 14 Aug 2016 03:03:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Aug 2016 03:03:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 28A6EDF9C4; Sun, 14 Aug 2016 03:03:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sun, 14 Aug 2016 03:03:38 -0000 Message-Id: <9879dbc418d94fcbad35275341228f59@git.apache.org> In-Reply-To: <416b353f197c4a34bf892c149185fc3b@git.apache.org> References: <416b353f197c4a34bf892c149185fc3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.8' archived-at: Sun, 14 Aug 2016 03:03:38 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62ba8ef8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62ba8ef8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62ba8ef8 Branch: refs/heads/master Commit: 62ba8ef8c8e955f7213c0abf5d9eba46c7d41acc Parents: 7954873 09c3832 Author: Josh Elser Authored: Sat Aug 13 23:02:35 2016 -0400 Committer: Josh Elser Committed: Sat Aug 13 23:02:35 2016 -0400 ---------------------------------------------------------------------- assemble/bin/stop-here.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) ----------------------------------------------------------------------