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 3FE3517A34 for ; Sat, 1 Nov 2014 17:42:12 +0000 (UTC) Received: (qmail 62629 invoked by uid 500); 1 Nov 2014 17:42:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 62596 invoked by uid 500); 1 Nov 2014 17:42:12 -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 62587 invoked by uid 99); 1 Nov 2014 17:42:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Nov 2014 17:42:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C3296993FCF; Sat, 1 Nov 2014 17:42: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: Sat, 01 Nov 2014 17:42:13 -0000 Message-Id: <3b7f124c9dd34b85a2edbf301b689723@git.apache.org> In-Reply-To: <5e918be1dc9d4dcc96bd6dc252ffa99e@git.apache.org> References: <5e918be1dc9d4dcc96bd6dc252ffa99e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6' Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c746fe28 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c746fe28 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c746fe28 Branch: refs/heads/master Commit: c746fe28a3fb75a3ffcc121569cde66f53db361d Parents: cfbdef1 e17d104 Author: Josh Elser Authored: Sat Nov 1 13:41:55 2014 -0400 Committer: Josh Elser Committed: Sat Nov 1 13:41:55 2014 -0400 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c746fe28/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ----------------------------------------------------------------------