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 D30A0103E9 for ; Mon, 25 Nov 2013 04:13:45 +0000 (UTC) Received: (qmail 16812 invoked by uid 500); 25 Nov 2013 04:13:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 16294 invoked by uid 500); 25 Nov 2013 04:13:39 -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 16280 invoked by uid 99); 25 Nov 2013 04:13:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Nov 2013 04:13:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F2D9F9049BA; Mon, 25 Nov 2013 04:13:37 +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: Mon, 25 Nov 2013 04:13:38 -0000 Message-Id: <90981c55ac814f47a3be030b572d30f6@git.apache.org> In-Reply-To: <8a2ee89e6b724d4c8671b6b8cde0004e@git.apache.org> References: <8a2ee89e6b724d4c8671b6b8cde0004e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/de2168e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de2168e0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de2168e0 Branch: refs/heads/1.6.0-SNAPSHOT Commit: de2168e0b8cbd2e5740eb28512ee29a8c0ace842 Parents: 7d24ff5 100e75b Author: Josh Elser Authored: Sun Nov 24 23:09:21 2013 -0500 Committer: Josh Elser Committed: Sun Nov 24 23:09:21 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/cli/Help.java | 14 ++++-- .../org/apache/accumulo/core/cli/TestHelp.java | 46 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) ----------------------------------------------------------------------