Merge branch '1.6'
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormat.java
core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/30fad5a6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/30fad5a6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/30fad5a6
Branch: refs/heads/master
Commit: 30fad5a638462847c2a0e80dd25b452d67fb9937
Parents: 868dcd5 abf0b99
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Wed Jan 28 14:00:49 2015 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Wed Jan 28 14:00:49 2015 -0500
----------------------------------------------------------------------
CHANGES | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 169 insertions(+)
----------------------------------------------------------------------
