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 0722618319 for ; Sun, 26 Jul 2015 23:48:12 +0000 (UTC) Received: (qmail 47521 invoked by uid 500); 26 Jul 2015 23:48:11 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 47422 invoked by uid 500); 26 Jul 2015 23:48:11 -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 47333 invoked by uid 99); 26 Jul 2015 23:48:11 -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; Sun, 26 Jul 2015 23:48:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9F536E00D5; Sun, 26 Jul 2015 23:48:11 +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: Sun, 26 Jul 2015 23:48:13 -0000 Message-Id: In-Reply-To: <8689ad0e50bf4ca1a61a4bb8f257b23c@git.apache.org> References: <8689ad0e50bf4ca1a61a4bb8f257b23c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/56e60ca0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/56e60ca0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/56e60ca0 Branch: refs/heads/master Commit: 56e60ca09d3c056ead1957f205a410a098305f7c Parents: 24a693b 3622556 Author: Josh Elser Authored: Sun Jul 26 19:47:40 2015 -0400 Committer: Josh Elser Committed: Sun Jul 26 19:47:40 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/shell/ShellOptionsJC.java | 5 +++++ .../apache/accumulo/shell/ShellOptionsJCTest.java | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) ----------------------------------------------------------------------