Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e605349c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e605349c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e605349c Branch: refs/heads/ACCUMULO-4463 Commit: e605349c0f6b42ae8ce625e52ae0bb5a686d850d Parents: b78edd3 54c82dc Author: Josh Elser <els...@apache.org> Authored: Mon May 15 17:17:24 2017 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon May 15 17:17:24 2017 -0400 ---------------------------------------------------------------------- .../core/client/mock/MockScannerBase.java | 7 +- .../core/client/mock/MockScannerTest.java | 103 +++++++++++++++++++ 2 files changed, 107 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e605349c/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java index 294e1d3,7c8f5cc..3c732d4 --- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java +++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockScannerBase.java @@@ -23,7 -23,7 +23,8 @@@ import java.util.HashSet import java.util.Iterator; import java.util.Map.Entry; + import org.apache.accumulo.core.client.SampleNotPresentException; +import org.apache.accumulo.core.client.ScannerBase; import org.apache.accumulo.core.client.impl.ScannerOptions; import org.apache.accumulo.core.client.sample.SamplerConfiguration; import org.apache.accumulo.core.conf.AccumuloConfiguration;
