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/43f0d7c1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/43f0d7c1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/43f0d7c1 Branch: refs/heads/master Commit: 43f0d7c1fead0bf396e80c9613528dc59cc37c51 Parents: 1bd9abc a89d97a Author: Josh Elser <els...@apache.org> Authored: Fri Jan 3 00:41:15 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Jan 3 00:41:15 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/client/mapred/AbstractInputFormat.java | 2 +- .../apache/accumulo/core/client/mapreduce/AbstractInputFormat.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
