Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B0703181D8 for ; Fri, 24 Apr 2015 03:58:00 +0000 (UTC) Received: (qmail 90997 invoked by uid 500); 24 Apr 2015 03:58:00 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 90933 invoked by uid 500); 24 Apr 2015 03:58:00 -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 90924 invoked by uid 99); 24 Apr 2015 03:58:00 -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; Fri, 24 Apr 2015 03:58:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1DAA0DFA69; Fri, 24 Apr 2015 03:58:00 +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: Fri, 24 Apr 2015 03:58:02 -0000 Message-Id: <56dee2eca850442db9468f9f0dc77a2f@git.apache.org> In-Reply-To: <24b02abb157b4a47b8c89702ec7c81f3@git.apache.org> References: <24b02abb157b4a47b8c89702ec7c81f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df71693 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df71693 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df71693 Branch: refs/heads/master Commit: 6df71693ee3cab71a51860d3ad0d9b25ec661263 Parents: a72b0d3 ea25e98 Author: Josh Elser Authored: Thu Apr 23 23:57:32 2015 -0400 Committer: Josh Elser Committed: Thu Apr 23 23:57:32 2015 -0400 ---------------------------------------------------------------------- .../accumulo/cluster/standalone/StandaloneClusterControl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------