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 F227517788 for ; Fri, 10 Oct 2014 22:41:44 +0000 (UTC) Received: (qmail 83595 invoked by uid 500); 10 Oct 2014 22:41:44 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 83515 invoked by uid 500); 10 Oct 2014 22:41:44 -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 83016 invoked by uid 99); 10 Oct 2014 22:41:44 -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, 10 Oct 2014 22:41:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 647E081E047; Fri, 10 Oct 2014 22:41:44 +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: Fri, 10 Oct 2014 22:42:02 -0000 Message-Id: <2f5e2f3feea64411ba0b993c0f5b5dd9@git.apache.org> In-Reply-To: <6ead8711baad470fa75fa99273dc8f79@git.apache.org> References: <6ead8711baad470fa75fa99273dc8f79@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/21] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9976bd73 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9976bd73 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9976bd73 Branch: refs/heads/master Commit: 9976bd737d1e0f1451ada7a5e0f2f1fb49a23667 Parents: 4acf7ab 72336eb Author: Josh Elser Authored: Fri Oct 10 18:41:23 2014 -0400 Committer: Josh Elser Committed: Fri Oct 10 18:41:23 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/shell/Shell.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------