Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/abb4f914 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/abb4f914 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/abb4f914 Branch: refs/heads/master Commit: abb4f9147bb65222c1df4c8f2af4758635fdf5dd Parents: 91bca47 43f0d7c Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 3 10:13:36 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 3 10:13:36 2014 -0500 ---------------------------------------------------------------------- .../core/client/mapred/AbstractInputFormat.java | 2 +- .../core/client/mapreduce/AbstractInputFormat.java | 2 +- pom.xml | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------