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 2E914182D5 for ; Thu, 27 Aug 2015 16:06:11 +0000 (UTC) Received: (qmail 99910 invoked by uid 500); 27 Aug 2015 16:06:11 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 99808 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 99510 invoked by uid 99); 27 Aug 2015 16:06:10 -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 C9279E7E86; 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:18 -0000 Message-Id: In-Reply-To: <920078a9dc0e4ba49fde8971b7aabcbf@git.apache.org> References: <920078a9dc0e4ba49fde8971b7aabcbf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/12] accumulo git commit: Merge remote-tracking branch 'dhutchis/ACCUMULO-3959' into 1.6 Merge remote-tracking branch 'dhutchis/ACCUMULO-3959' 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/2906895c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2906895c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2906895c Branch: refs/heads/1.6 Commit: 2906895c5f7e7a00b6852b96d9ea190c6ffa8ce3 Parents: bec493a d6427e1 Author: Josh Elser Authored: Thu Aug 27 11:44:31 2015 -0400 Committer: Josh Elser Committed: Thu Aug 27 11:44:31 2015 -0400 ---------------------------------------------------------------------- .../accumulo/core/client/BatchScanner.java | 28 +++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) ----------------------------------------------------------------------