Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2407376f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2407376f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2407376f Branch: refs/heads/master Commit: 2407376fc69e169c44ba9645cd2d7e0435e09ebf Parents: a0e0244 941e3cb Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Oct 23 09:40:07 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Oct 23 09:40:07 2013 -0400 ---------------------------------------------------------------------- bin/tool.sh | 5 +- .../core/client/impl/OfflineScanner.java | 14 +- .../core/client/mapred/AbstractInputFormat.java | 143 +++---------------- .../client/mapreduce/AbstractInputFormat.java | 138 +++--------------- .../mapreduce/lib/util/InputConfigurator.java | 116 ++++++++++++++- .../simple/mapreduce/UniqueColumns.java | 7 +- 6 files changed, 173 insertions(+), 250 deletions(-) ----------------------------------------------------------------------
