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/54f737f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/54f737f2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/54f737f2 Branch: refs/heads/master Commit: 54f737f2e6259fa424be9d3aa4245956ebea30cd Parents: f460013 f8e14c7 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Nov 26 15:08:40 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Nov 26 15:08:40 2013 -0500 ---------------------------------------------------------------------- .../core/client/mapreduce/RangeInputSplit.java | 81 ++++++++++---------- .../mapreduce/AccumuloInputFormatTest.java | 18 +++-- .../accumulo/test/functional/ExamplesIT.java | 27 ++++--- 3 files changed, 70 insertions(+), 56 deletions(-) ----------------------------------------------------------------------