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 DB0E710154 for ; Mon, 10 Feb 2014 20:29:56 +0000 (UTC) Received: (qmail 67637 invoked by uid 500); 10 Feb 2014 20:29:52 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 67501 invoked by uid 500); 10 Feb 2014 20:29:50 -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 67409 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 C78FB9227B3; 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:53 -0000 Message-Id: <5f1e3a0cef3947f884cab8ccda60f5f0@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '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/2d58bbd3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d58bbd3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d58bbd3 Branch: refs/heads/master Commit: 2d58bbd37e9ba7fa0763d1016aa76e624ac0c441 Parents: 66230c9 1f37513 Author: Josh Elser Authored: Mon Feb 10 15:29:30 2014 -0500 Committer: Josh Elser Committed: Mon Feb 10 15:29:30 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/impl/TabletServerBatchReaderIterator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------