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/5b4ec334 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5b4ec334 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5b4ec334 Branch: refs/heads/master Commit: 5b4ec3343c8a13db152e9b7bd2783b89357d4170 Parents: 04f4854 99ebfc7 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Jan 22 14:03:16 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Jan 22 14:03:16 2014 -0500 ---------------------------------------------------------------------- .../mapreduce/lib/util/InputConfigurator.java | 11 +++++++++-- .../client/mapreduce/AccumuloInputFormatTest.java | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
