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 90C0110AC3 for ; Tue, 18 Mar 2014 18:31:30 +0000 (UTC) Received: (qmail 50602 invoked by uid 500); 18 Mar 2014 18:31:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 50508 invoked by uid 500); 18 Mar 2014 18:31:29 -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 50493 invoked by uid 99); 18 Mar 2014 18:31:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Mar 2014 18:31:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 70995947D44; Tue, 18 Mar 2014 18:31:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Tue, 18 Mar 2014 18:31:29 -0000 Message-Id: <8399da4752a74d3e88dd832f40cf5ecc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '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/39807cb2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/39807cb2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/39807cb2 Branch: refs/heads/master Commit: 39807cb2a07106cca959a190d046b2bb4fb559d5 Parents: 4dfdc35 70d4726 Author: Keith Turner Authored: Tue Mar 18 14:36:10 2014 -0400 Committer: Keith Turner Committed: Tue Mar 18 14:36:10 2014 -0400 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ShellConfigIT.java | 3 --- 1 file changed, 3 deletions(-) ----------------------------------------------------------------------