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 720CB1092E for ; Sun, 9 Feb 2014 23:06:15 +0000 (UTC) Received: (qmail 67198 invoked by uid 500); 9 Feb 2014 23:06:11 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 67121 invoked by uid 500); 9 Feb 2014 23:06:10 -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 66980 invoked by uid 99); 9 Feb 2014 23:06:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Feb 2014 23:06:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9F98D9214CF; Sun, 9 Feb 2014 23:06:08 +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: Sun, 09 Feb 2014 23:06:12 -0000 Message-Id: <418393ab80fc464c9390076974e6f524@git.apache.org> In-Reply-To: <8bed2525996b405c8d7ce756a4dd8cc4@git.apache.org> References: <8bed2525996b405c8d7ce756a4dd8cc4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 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/d8fd73e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d8fd73e2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d8fd73e2 Branch: refs/heads/1.6.0-SNAPSHOT Commit: d8fd73e2a909e86ee633748132c84023b8094094 Parents: 4b51dd0 4cb92ca Author: Josh Elser Authored: Sun Feb 9 18:00:35 2014 -0500 Committer: Josh Elser Committed: Sun Feb 9 18:00:35 2014 -0500 ---------------------------------------------------------------------- .../core/client/impl/TabletServerBatchReaderIterator.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d8fd73e2/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ----------------------------------------------------------------------