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 9F3BD2009F4 for ; Thu, 26 May 2016 21:14:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9DF6C160A17; Thu, 26 May 2016 19:14:24 +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 36943160A41 for ; Thu, 26 May 2016 21:14:23 +0200 (CEST) Received: (qmail 88946 invoked by uid 500); 26 May 2016 19:14:22 -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 88772 invoked by uid 99); 26 May 2016 19:14:22 -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; Thu, 26 May 2016 19:14:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DA891E962B; Thu, 26 May 2016 19:14:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Thu, 26 May 2016 19:14:33 -0000 Message-Id: <80ec8c3df9694e429e4d9c1f8cfb720a@git.apache.org> In-Reply-To: <74fa2882923d418d9cb557a20a63ada3@git.apache.org> References: <74fa2882923d418d9cb557a20a63ada3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/13] accumulo git commit: Merge branch '1.8' archived-at: Thu, 26 May 2016 19:14:24 -0000 Merge branch '1.8' This closes #99 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f07c6d0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f07c6d0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f07c6d0 Branch: refs/heads/master Commit: 4f07c6d01c503a2eee7ec325d097acebc1f17b2c Parents: cd2873f e15b023 Author: Christopher Tubbs Authored: Thu May 26 14:37:56 2016 -0400 Committer: Christopher Tubbs Committed: Thu May 26 14:37:56 2016 -0400 ---------------------------------------------------------------------- docs/src/main/asciidoc/chapters/administration.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ----------------------------------------------------------------------