Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f7fd2989 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f7fd2989 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f7fd2989 Branch: refs/heads/master Commit: f7fd2989df60b11bfdb623f9805a001847ef02bd Parents: 16218af 674fa95 Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Dec 19 16:27:25 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Dec 19 16:27:25 2013 -0500 ---------------------------------------------------------------------- .../client/mapreduce/AbstractInputFormat.java | 254 ++++++++++--------- .../client/mapreduce/AccumuloOutputFormat.java | 5 +- .../mapreduce/lib/util/InputConfigurator.java | 12 +- 3 files changed, 143 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
