Return-Path: 
 <commits-return-16315-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
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 E72EC18BEC
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed,  8 Jul 2015 02:40:16 +0000 (UTC)
Received: (qmail 76113 invoked by uid 500); 8 Jul 2015 02:40:16 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 76026 invoked by uid 500); 8 Jul 2015 02:40:16 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 75662 invoked by uid 99); 8 Jul 2015 02:40:16 -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; Wed, 08 Jul 2015 02:40:16 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 1B496E3C41; Wed,  8 Jul 2015 02:40:16 +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: Wed, 08 Jul 2015 02:40:24 -0000
Message-Id: <b4f04ecdc48344529739c615ed50331a@git.apache.org>
In-Reply-To: <493f6d6607d142e682261d436e33e144@git.apache.org>
References: <493f6d6607d142e682261d436e33e144@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [10/12] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7

Conflicts:
	assemble/pom.xml
	core/pom.xml
	docs/pom.xml
	examples/simple/pom.xml
	fate/pom.xml
	maven-plugin/pom.xml
	minicluster/pom.xml
	pom.xml
	proxy/pom.xml
	server/base/pom.xml
	server/gc/pom.xml
	server/master/pom.xml
	server/monitor/pom.xml
	server/native/pom.xml
	server/tracer/pom.xml
	server/tserver/pom.xml
	start/pom.xml
	test/pom.xml
	trace/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b9a190a4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b9a190a4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b9a190a4

Branch: refs/heads/1.7
Commit: b9a190a4386fe19e49389fa2bf7c960009fa6d87
Parents: acef2e5 68dd750
Author: Josh Elser <elserj@apache.org>
Authored: Tue Jul 7 22:39:41 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Jul 7 22:39:41 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/accumulo/core/client/BatchScanner.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b9a190a4/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index 8be6acf,47e6db1..de82d2f
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@@ -29,7 -29,12 +29,11 @@@ import org.apache.accumulo.core.data.Ra
   *
   * If you want to lookup a few ranges and expect those ranges to contain a lot of data, then use the Scanner instead. Also, the Scanner will return data in
   * sorted order, this will not.
+  *
+  * A BatchScanner instance will use no more threads than provided in the construction of the BatchScanner
+  * implementation. Multiple invocations of <code>iterator()</code> will all share the same resources of the instance.
+  * A new BatchScanner instance should be created to use allocate additional threads.
   */
 -
  public interface BatchScanner extends ScannerBase {
  
    /**