Updated Branches: refs/heads/1.6.0-SNAPSHOT 1873fc565 -> a573f96d4 refs/heads/master abb4f9147 -> 86a26fe67
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/1873fc56 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1873fc56 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1873fc56 Branch: refs/heads/master Commit: 1873fc5658ef3413ffc3d36d88ff4f5ea5d85266 Parents: 51f84de a89d97a Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 3 10:13:45 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 3 10:13:45 2014 -0500 ---------------------------------------------------------------------- .../core/client/mapred/AbstractInputFormat.java | 2 +- .../core/client/mapreduce/AbstractInputFormat.java | 2 +- pom.xml | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
