You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by el...@apache.org on 2014/04/11 22:52:58 UTC

[6/7] git commit: Merge branch '1.6.0-SNAPSHOT'

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/a5d772d7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a5d772d7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a5d772d7

Branch: refs/heads/master
Commit: a5d772d718d76c6ad2c800369ee0d16ef7cbc360
Parents: 4c1017e 50f8257
Author: Josh Elser <el...@apache.org>
Authored: Fri Apr 11 16:52:22 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Apr 11 16:52:22 2014 -0400

----------------------------------------------------------------------
 .../core/client/mapred/InputFormatBase.java     | 38 ++++++++++++++------
 .../core/client/mapreduce/InputFormatBase.java  | 17 +++++++--
 2 files changed, 42 insertions(+), 13 deletions(-)
----------------------------------------------------------------------