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 C22BE1887C for ; Thu, 14 May 2015 05:30:14 +0000 (UTC) Received: (qmail 78491 invoked by uid 500); 14 May 2015 05:30:14 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 78394 invoked by uid 500); 14 May 2015 05:30:14 -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 78311 invoked by uid 99); 14 May 2015 05:30:14 -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, 14 May 2015 05:30:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 87ED1E0921; Thu, 14 May 2015 05:30:14 +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: Thu, 14 May 2015 05:30:16 -0000 Message-Id: <75dd81de46d64f4c8c13ea04fef6629b@git.apache.org> In-Reply-To: References: 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/81302d39 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/81302d39 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/81302d39 Branch: refs/heads/master Commit: 81302d398f4f6e8c5b6b7581638a65efe5a22c9a Parents: 11fb442 b347440 Author: Josh Elser Authored: Thu May 14 01:30:04 2015 -0400 Committer: Josh Elser Committed: Thu May 14 01:30:04 2015 -0400 ---------------------------------------------------------------------- docs/src/main/asciidoc/chapters/kerberos.txt | 83 +++++++++++++++-------- 1 file changed, 53 insertions(+), 30 deletions(-) ----------------------------------------------------------------------