Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d798d512 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d798d512 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d798d512 Branch: refs/heads/master Commit: d798d51211857a1e6d7390e04ee903ca8042fd31 Parents: 999115e 9a32ec1 Author: Josh Elser <els...@apache.org> Authored: Fri Dec 19 15:45:45 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Dec 19 15:45:45 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/mapreduce/AbstractInputFormat.java | 2 +- .../accumulo/examples/simple/mapreduce/TeraSortIngest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d798d512/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d798d512/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java ---------------------------------------------------------------------- diff --cc examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java index afbc4b0,f10ec3e..ade6ce1 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java @@@ -25,9 -25,10 +25,10 @@@ import java.util.ArrayList import java.util.List; import java.util.Random; -import org.apache.accumulo.core.cli.ClientOnRequiredTable; +import org.apache.accumulo.core.cli.MapReduceClientOnRequiredTable; import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat; + import org.apache.accumulo.core.client.mapreduce.InputFormatBase; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.hadoop.conf.Configuration;
