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 <els...@apache.org>
Authored: Tue Jul 7 22:39:41 2015 -0400
Committer: Josh Elser <els...@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 {
/**
