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 48E3410730 for ; Fri, 13 Dec 2013 22:21:23 +0000 (UTC) Received: (qmail 20927 invoked by uid 500); 13 Dec 2013 22:21:23 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 20836 invoked by uid 500); 13 Dec 2013 22:21:23 -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 20822 invoked by uid 99); 13 Dec 2013 22:21:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Dec 2013 22:21:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D89CC8B875B; Fri, 13 Dec 2013 22:21:22 +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: Fri, 13 Dec 2013 22:21:24 -0000 Message-Id: In-Reply-To: <934bfa20c44c471aaa494410c156a147@git.apache.org> References: <934bfa20c44c471aaa494410c156a147@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6a3f907 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6a3f907 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6a3f907 Branch: refs/heads/1.6.0-SNAPSHOT Commit: f6a3f907b50b6de7cbde8331581ae6636048d9a1 Parents: 6248299 b65bdd6 Author: Christopher Tubbs Authored: Fri Dec 13 17:13:19 2013 -0500 Committer: Christopher Tubbs Committed: Fri Dec 13 17:13:19 2013 -0500 ---------------------------------------------------------------------- .../latex/accumulo_user_manual/chapters/administration.tex | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6a3f907/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex ----------------------------------------------------------------------