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 D990A10152 for ; Mon, 10 Feb 2014 20:29:56 +0000 (UTC) Received: (qmail 67619 invoked by uid 500); 10 Feb 2014 20:29:52 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 67443 invoked by uid 500); 10 Feb 2014 20:29:49 -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 67398 invoked by uid 99); 10 Feb 2014 20:29:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 20:29:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BDF5B9227AF; Mon, 10 Feb 2014 20:29:48 +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, 10 Feb 2014 20:29:51 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/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/1f375130 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f375130 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f375130 Branch: refs/heads/master Commit: 1f3751309b52282fcfb88f87d15a746925fe854c Parents: d60a38c 6730880 Author: Josh Elser Authored: Mon Feb 10 15:29:23 2014 -0500 Committer: Josh Elser Committed: Mon Feb 10 15:29:23 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/impl/TabletServerBatchReaderIterator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f375130/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java ----------------------------------------------------------------------