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 D0591200BBC for ; Sat, 8 Oct 2016 22:50:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CF23C160ADF; Sat, 8 Oct 2016 20:50:44 +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 25E58160AF3 for ; Sat, 8 Oct 2016 22:50:43 +0200 (CEST) Received: (qmail 38224 invoked by uid 500); 8 Oct 2016 20:50:43 -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 38153 invoked by uid 99); 8 Oct 2016 20:50:43 -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; Sat, 08 Oct 2016 20:50:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 090BEE053F; Sat, 8 Oct 2016 20:50:43 +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: Sat, 08 Oct 2016 20:50:47 -0000 Message-Id: <1edbc4003e9943d19c4bc87d551b64d6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] accumulo git commit: Merge branch '1.8' archived-at: Sat, 08 Oct 2016 20:50:45 -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/79ec6409 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/79ec6409 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/79ec6409 Branch: refs/heads/master Commit: 79ec6409f24425b70c84b795e41f9c2d5dad3708 Parents: f206bef f8fbf32 Author: Josh Elser Authored: Sat Oct 8 16:50:37 2016 -0400 Committer: Josh Elser Committed: Sat Oct 8 16:50:37 2016 -0400 ---------------------------------------------------------------------- docs/src/main/asciidoc/chapters/kerberos.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/79ec6409/docs/src/main/asciidoc/chapters/kerberos.txt ----------------------------------------------------------------------