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 3A7A0182D7 for ; Thu, 27 Aug 2015 16:06:11 +0000 (UTC) Received: (qmail 136 invoked by uid 500); 27 Aug 2015 16:06:11 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 99929 invoked by uid 500); 27 Aug 2015 16:06:11 -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 99567 invoked by uid 99); 27 Aug 2015 16:06:11 -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; Thu, 27 Aug 2015 16:06:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DFF3ADFBE6; Thu, 27 Aug 2015 16:06:10 +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: Thu, 27 Aug 2015 16:06:21 -0000 Message-Id: In-Reply-To: <920078a9dc0e4ba49fde8971b7aabcbf@git.apache.org> References: <920078a9dc0e4ba49fde8971b7aabcbf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/12] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dd678089 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd678089 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd678089 Branch: refs/heads/master Commit: dd6780898b93d3a1909654077911a53d7c8656b4 Parents: 3f7b72e 162acf2 Author: Josh Elser Authored: Thu Aug 27 12:06:22 2015 -0400 Committer: Josh Elser Committed: Thu Aug 27 12:06:22 2015 -0400 ---------------------------------------------------------------------- .../accumulo/core/client/BatchScanner.java | 24 ++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) ----------------------------------------------------------------------