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/77bb2730 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/77bb2730 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/77bb2730 Branch: refs/heads/master Commit: 77bb27300c096c47ce40eb3cfffbe63906ed907c Parents: e48e51e 86cafd9 Author: Josh Elser <els...@apache.org> Authored: Tue Apr 1 18:16:09 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Apr 1 18:16:09 2014 -0400 ---------------------------------------------------------------------- .../core/client/mapred/AccumuloInputFormat.java | 5 ++--- .../core/client/mapred/InputFormatBase.java | 21 ++++++++++++++++-- .../client/mapreduce/AccumuloInputFormat.java | 4 ++-- .../core/client/mapreduce/InputFormatBase.java | 23 ++++++++++++++++++-- .../BadPasswordSplitsAccumuloInputFormat.java | 2 +- .../EmptySplitsAccumuloInputFormat.java | 2 +- 6 files changed, 46 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
