Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ceb1a74d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ceb1a74d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ceb1a74d
Branch: refs/heads/master
Commit: ceb1a74d06dedeb53e975e9a0672ad5f456c9fb4
Parents: f08bbfe f848178
Author: Josh Elser <els...@apache.org>
Authored: Fri Jul 25 00:17:04 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Fri Jul 25 00:17:04 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/client/mapreduce/RangeInputSplitTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ceb1a74d/core/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
----------------------------------------------------------------------
