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/c9f52faa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c9f52faa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c9f52faa Branch: refs/heads/master Commit: c9f52faa72de440ee471d342c77d662ea1ec90f4 Parents: 0ee108e b2008ca Author: Josh Elser <els...@apache.org> Authored: Thu Apr 10 23:49:47 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Apr 10 23:49:47 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/client/mapred/InputFormatBase.java | 4 ++++ .../apache/accumulo/core/client/mapreduce/InputFormatBase.java | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
