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/a5d772d7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a5d772d7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a5d772d7 Branch: refs/heads/master Commit: a5d772d718d76c6ad2c800369ee0d16ef7cbc360 Parents: 4c1017e 50f8257 Author: Josh Elser <els...@apache.org> Authored: Fri Apr 11 16:52:22 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Apr 11 16:52:22 2014 -0400 ---------------------------------------------------------------------- .../core/client/mapred/InputFormatBase.java | 38 ++++++++++++++------ .../core/client/mapreduce/InputFormatBase.java | 17 +++++++-- 2 files changed, 42 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
