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 995511150B for ; Thu, 18 Sep 2014 19:01:49 +0000 (UTC) Received: (qmail 13643 invoked by uid 500); 18 Sep 2014 19:01:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 13541 invoked by uid 500); 18 Sep 2014 19:01:49 -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 13527 invoked by uid 99); 18 Sep 2014 19:01:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Sep 2014 19:01:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1BA9AA1B815; Thu, 18 Sep 2014 19:01:49 +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: Thu, 18 Sep 2014 19:01:51 -0000 Message-Id: <0d34727a4213419b877e8d3af4cffd41@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62cf3df1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62cf3df1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62cf3df1 Branch: refs/heads/master Commit: 62cf3df10f27f3203ed05de1805f8de9f371b6d6 Parents: cf6679f 992414e Author: Josh Elser Authored: Thu Sep 18 15:01:37 2014 -0400 Committer: Josh Elser Committed: Thu Sep 18 15:01:37 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ShellServerIT.java | 89 +++++++++++--------- 1 file changed, 48 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/62cf3df1/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ----------------------------------------------------------------------