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 2D7AC175EA for ; Wed, 1 Oct 2014 22:24:28 +0000 (UTC) Received: (qmail 86855 invoked by uid 500); 1 Oct 2014 22:24:28 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 86740 invoked by uid 500); 1 Oct 2014 22:24:28 -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 86643 invoked by uid 99); 1 Oct 2014 22:24: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; Wed, 01 Oct 2014 22:24:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CCA4D9C3695; Wed, 1 Oct 2014 22:24:27 +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, 01 Oct 2014 22:24:29 -0000 Message-Id: <304e62441d9f4067b6f4fad04b1e7177@git.apache.org> In-Reply-To: <61ce1b0b24ce45169b2af23cfa2a2577@git.apache.org> References: <61ce1b0b24ce45169b2af23cfa2a2577@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/5] git commit: Merge remote-tracking branch 'origin/1.6' into 1.6 Merge remote-tracking branch 'origin/1.6' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c90ee9a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c90ee9a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c90ee9a Branch: refs/heads/master Commit: 3c90ee9a86691f2d7ee759aa313d9515323680ca Parents: c5afc5a d3586ea Author: Eric C. Newton Authored: Wed Oct 1 18:22:44 2014 -0400 Committer: Eric C. Newton Committed: Wed Oct 1 18:22:44 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/master/FateServiceHandler.java | 2 +- .../java/org/apache/accumulo/tserver/RootFiles.java | 2 +- .../apache/accumulo/test/functional/SlowIterator.java | 13 ++++++------- .../test/functional/AccumuloInputFormatIT.java | 4 +++- .../apache/accumulo/test/functional/ExamplesIT.java | 3 ++- 5 files changed, 13 insertions(+), 11 deletions(-) ----------------------------------------------------------------------