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 D2F68100DC for ; Tue, 25 Mar 2014 00:37:36 +0000 (UTC) Received: (qmail 46970 invoked by uid 500); 25 Mar 2014 00:37:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 46894 invoked by uid 500); 25 Mar 2014 00:37:29 -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 46852 invoked by uid 99); 25 Mar 2014 00:37:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Mar 2014 00:37:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0D7D78BB277; Tue, 25 Mar 2014 00:37:28 +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: Tue, 25 Mar 2014 00:37:33 -0000 Message-Id: <567c49cd423d486595b2c32b1b9398f6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '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/139a192e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/139a192e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/139a192e Branch: refs/heads/master Commit: 139a192ee4dbd49defb97d27c7b1d30eabd1dcb3 Parents: a9f1767 05254f3 Author: Josh Elser Authored: Mon Mar 24 17:37:12 2014 -0700 Committer: Josh Elser Committed: Mon Mar 24 17:37:12 2014 -0700 ---------------------------------------------------------------------- .../accumulo_user_manual/chapters/design.tex | 24 ++++++++++- .../chapters/troubleshooting.tex | 43 +++++++++++++++++++- 2 files changed, 65 insertions(+), 2 deletions(-) ----------------------------------------------------------------------