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 EB9D3200B8E for ; Mon, 26 Sep 2016 18:20:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EA743160AE3; Mon, 26 Sep 2016 16:20:19 +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 2D157160AE6 for ; Mon, 26 Sep 2016 18:20:19 +0200 (CEST) Received: (qmail 99411 invoked by uid 500); 26 Sep 2016 16:20:18 -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 99317 invoked by uid 99); 26 Sep 2016 16:20:18 -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; Mon, 26 Sep 2016 16:20:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 19A08DFB7D; Mon, 26 Sep 2016 16:20:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Mon, 26 Sep 2016 16:20:22 -0000 Message-Id: <682735832c0c4af8a4e2231771837ba9@git.apache.org> In-Reply-To: <3ddc37a8b1474bd09221aa7be0f2dc4d@git.apache.org> References: <3ddc37a8b1474bd09221aa7be0f2dc4d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: Merge branch '1.8' archived-at: Mon, 26 Sep 2016 16:20:20 -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/6823140e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6823140e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6823140e Branch: refs/heads/master Commit: 6823140eb5f3fded282eb02daf8d3f6f9d80c3b4 Parents: ababa81 38606a8 Author: Sean Busbey Authored: Mon Sep 26 11:05:38 2016 -0500 Committer: Sean Busbey Committed: Mon Sep 26 11:05:38 2016 -0500 ---------------------------------------------------------------------- docs/src/main/asciidoc/chapters/replication.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6823140e/docs/src/main/asciidoc/chapters/replication.txt ----------------------------------------------------------------------