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 585AF18851 for ; Wed, 27 Jan 2016 14:07:01 +0000 (UTC) Received: (qmail 91923 invoked by uid 500); 27 Jan 2016 14:07:01 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 91852 invoked by uid 500); 27 Jan 2016 14:07:01 -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 91829 invoked by uid 99); 27 Jan 2016 14:07:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jan 2016 14:07:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B2D1E00DC; Wed, 27 Jan 2016 14:07:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Wed, 27 Jan 2016 14:07:03 -0000 Message-Id: <2787ef1ca964474583adf837942a8796@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3f596ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3f596ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3f596ea Branch: refs/heads/master Commit: c3f596eadc0946eb55dc16575c6b9be8e63f214e Parents: 2d99238 9036325 Author: Eric C. Newton Authored: Wed Jan 27 09:01:54 2016 -0500 Committer: Eric C. Newton Committed: Wed Jan 27 09:01:54 2016 -0500 ---------------------------------------------------------------------- test/system/continuous/mapred-setup.sh | 25 ------------------------- test/system/continuous/run-moru.sh | 8 ++++++++ test/system/continuous/run-verify.sh | 6 +++++- 3 files changed, 13 insertions(+), 26 deletions(-) ----------------------------------------------------------------------