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 CBE611017F for ; Mon, 2 Feb 2015 23:14:51 +0000 (UTC) Received: (qmail 20829 invoked by uid 500); 2 Feb 2015 23:14:30 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 20727 invoked by uid 500); 2 Feb 2015 23:14: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 20600 invoked by uid 99); 2 Feb 2015 23:14:30 -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; Mon, 02 Feb 2015 23:14:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6978AE0531; Mon, 2 Feb 2015 23:14:30 +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: Mon, 02 Feb 2015 23:14:34 -0000 Message-Id: In-Reply-To: <3cfef03ae57b4eaebcb69ef154406887@git.apache.org> References: <3cfef03ae57b4eaebcb69ef154406887@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] accumulo git commit: Merge branch '1.5' into 1.6 Merge branch '1.5' 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/4999b5a2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4999b5a2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4999b5a2 Branch: refs/heads/1.6 Commit: 4999b5a2398c04f70423d11624aa0ba114b73faf Parents: c5d2bd5 4e8471a Author: Josh Elser Authored: Mon Feb 2 18:10:17 2015 -0500 Committer: Josh Elser Committed: Mon Feb 2 18:10:17 2015 -0500 ---------------------------------------------------------------------- .../core/client/impl/TabletServerBatchReaderIterator.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4999b5a2/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ----------------------------------------------------------------------