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 C977110408 for ; Thu, 5 Dec 2013 04:53:35 +0000 (UTC) Received: (qmail 39895 invoked by uid 500); 5 Dec 2013 04:53:32 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 39794 invoked by uid 500); 5 Dec 2013 04:53:31 -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 39723 invoked by uid 99); 5 Dec 2013 04:53:31 -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, 05 Dec 2013 04:53:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 43B44320D00; Thu, 5 Dec 2013 04:53:28 +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, 05 Dec 2013 04:53:31 -0000 Message-Id: <7b43395f18944eb1a899d7796790f9e8@git.apache.org> In-Reply-To: <4a61dd98426f4aefa22d4d39f1b62e02@git.apache.org> References: <4a61dd98426f4aefa22d4d39f1b62e02@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/7] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/continuous/magitator.pl Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0833f4fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0833f4fa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0833f4fa Branch: refs/heads/master Commit: 0833f4fab85951dca371afe87cf6cbabdf730161 Parents: c1fa557 6175d7a Author: Josh Elser Authored: Wed Dec 4 23:51:04 2013 -0500 Committer: Josh Elser Committed: Wed Dec 4 23:51:04 2013 -0500 ---------------------------------------------------------------------- test/system/continuous/magitator.pl | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------