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/370bb23b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/370bb23b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/370bb23b Branch: refs/heads/master Commit: 370bb23b2a8f46f35098424a60bbed20110ee28d Parents: a5d772d 019edb1 Author: Josh Elser <els...@apache.org> Authored: Fri Apr 11 17:46:30 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Apr 11 17:46:30 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/mapred/InputFormatBase.java | 3 +++ 1 file changed, 3 insertions(+) ----------------------------------------------------------------------
