You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2015/05/04 22:33:09 UTC
[2/2] accumulo git commit: Merge branch '1.7'
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8cbaa057
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8cbaa057
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8cbaa057
Branch: refs/heads/master
Commit: 8cbaa05765d296b6799f47cfc7bd6fb313f40524
Parents: ca02e85 83d1b83
Author: Keith Turner <kt...@apache.org>
Authored: Mon May 4 16:23:50 2015 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Mon May 4 16:23:50 2015 -0400
----------------------------------------------------------------------
.../core/client/mapred/AbstractInputFormat.java | 83 ++--
.../core/client/mapred/AccumuloInputFormat.java | 4 +-
.../client/mapreduce/AbstractInputFormat.java | 78 ++--
.../client/mapreduce/AccumuloInputFormat.java | 5 +-
.../core/client/mapreduce/RangeInputSplit.java | 411 +++++++++++++++--
.../mapreduce/impl/AccumuloInputSplit.java | 436 -------------------
.../client/mapreduce/impl/BatchInputSplit.java | 47 +-
.../core/client/mapreduce/impl/SplitUtils.java | 43 +-
8 files changed, 540 insertions(+), 567 deletions(-)
----------------------------------------------------------------------