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 7D4B9107DF for ; Fri, 10 Jan 2014 23:34:40 +0000 (UTC) Received: (qmail 75781 invoked by uid 500); 10 Jan 2014 23:34:40 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 75685 invoked by uid 500); 10 Jan 2014 23:34:40 -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 75631 invoked by uid 99); 10 Jan 2014 23:34:39 -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 Jan 2014 23:34:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8F19E32ACA0; Fri, 10 Jan 2014 23:34:39 +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 Jan 2014 23:34:48 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/12] 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/d1b53eda Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1b53eda Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1b53eda Branch: refs/heads/master Commit: d1b53eda9532310b43d0e1cc41f3495da4642540 Parents: 7c30909 56230eb Author: Josh Elser Authored: Fri Jan 10 18:31:05 2014 -0500 Committer: Josh Elser Committed: Fri Jan 10 18:31:05 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/util/shell/commands/ExecfileCommand.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ----------------------------------------------------------------------