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 56721200B91 for ; Thu, 29 Sep 2016 22:01:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 52098160AEB; Thu, 29 Sep 2016 20:01:01 +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 A030F160AE8 for ; Thu, 29 Sep 2016 22:01:00 +0200 (CEST) Received: (qmail 69820 invoked by uid 500); 29 Sep 2016 20:00:59 -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 69647 invoked by uid 99); 29 Sep 2016 20:00:59 -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, 29 Sep 2016 20:00:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8AADDE09AC; Thu, 29 Sep 2016 20:00:59 +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, 29 Sep 2016 20:01:03 -0000 Message-Id: In-Reply-To: <47aa9f929dab4d47a0e3f4f04e3e4fbe@git.apache.org> References: <47aa9f929dab4d47a0e3f4f04e3e4fbe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo git commit: Merge branch '1.7' into 1.8 archived-at: Thu, 29 Sep 2016 20:01:01 -0000 Merge branch '1.7' into 1.8 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/272ac288 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/272ac288 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/272ac288 Branch: refs/heads/1.8 Commit: 272ac28884af328ff04f342dcfe5a3bb74bc5bfe Parents: 2270bee 52f53f5 Author: Christopher Tubbs Authored: Thu Sep 29 15:38:53 2016 -0400 Committer: Christopher Tubbs Committed: Thu Sep 29 15:38:53 2016 -0400 ---------------------------------------------------------------------- docs/pom.xml | 6 ++++++ docs/src/main/asciidoc/accumulo_user_manual.asciidoc | 6 +++--- docs/src/main/asciidoc/chapters/administration.txt | 4 ++-- docs/src/main/asciidoc/chapters/clients.txt | 2 +- docs/src/main/asciidoc/chapters/kerberos.txt | 2 +- docs/src/main/resources/examples/README | 2 +- pom.xml | 12 ++++++++++++ 7 files changed, 26 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/asciidoc/accumulo_user_manual.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/asciidoc/chapters/administration.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/docs/src/main/resources/examples/README ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/272ac288/pom.xml ----------------------------------------------------------------------