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 3FB3610427 for ; Wed, 27 Nov 2013 02:13:30 +0000 (UTC) Received: (qmail 29297 invoked by uid 500); 27 Nov 2013 02:13:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 29263 invoked by uid 500); 27 Nov 2013 02:13:30 -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 29152 invoked by uid 99); 27 Nov 2013 02:13:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Nov 2013 02:13:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B65BC9195A3; Wed, 27 Nov 2013 02:13:29 +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: Wed, 27 Nov 2013 02:13:34 -0000 Message-Id: <774e7d0a8012403fbaf7086ab6e3e350@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/240436e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/240436e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/240436e6 Branch: refs/heads/master Commit: 240436e6ae2bf7139041bb3116369fc164b136dd Parents: eaa2f28 c70d14e Author: Josh Elser Authored: Tue Nov 26 21:13:02 2013 -0500 Committer: Josh Elser Committed: Tue Nov 26 21:13:02 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java | 2 +- test/system/continuous/continuous-env.sh.example | 1 + test/system/continuous/start-agitator.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------