accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [31/31] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Sun, 24 Nov 2013 00:34:02 GMT
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/cf3e1fe7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf3e1fe7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf3e1fe7

Branch: refs/heads/master
Commit: cf3e1fe75e88f4687e8410588019c57820aa1836
Parents: e63d902 7d24ff5
Author: Josh Elser <elserj@apache.org>
Authored: Sat Nov 23 18:53:45 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Sat Nov 23 18:53:45 2013 -0500

----------------------------------------------------------------------
 .../core/client/mapred/AbstractInputFormat.java | 154 ++++--
 .../core/client/mapred/AccumuloInputFormat.java |  12 +
 .../core/client/mapred/InputFormatBase.java     |  14 +-
 .../core/client/mapred/RangeInputSplit.java     |  40 ++
 .../client/mapreduce/AbstractInputFormat.java   | 288 +++++------
 .../client/mapreduce/AccumuloInputFormat.java   |  11 +
 .../AccumuloMultiTableInputFormat.java          |   8 +-
 .../core/client/mapreduce/InputFormatBase.java  |  13 +-
 .../core/client/mapreduce/RangeInputSplit.java  | 486 +++++++++++++++++++
 .../mapreduce/lib/util/ConfiguratorBase.java    |   8 +-
 .../mapreduce/lib/util/InputConfigurator.java   |  24 +-
 .../AccumuloMultiTableInputFormatTest.java      |   6 +-
 .../mapreduce/AccumuloInputFormatTest.java      | 206 ++++++--
 .../AccumuloMultiTableInputFormatTest.java      |   2 +-
 .../BadPasswordSplitsAccumuloInputFormat.java   |  42 ++
 .../EmptySplitsAccumuloInputFormat.java         |  45 ++
 .../client/mapreduce/RangeInputSplitTest.java   | 107 ++++
 17 files changed, 1179 insertions(+), 287 deletions(-)
----------------------------------------------------------------------



Mime
View raw message