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/88a9b53d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/88a9b53d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/88a9b53d Branch: refs/heads/master Commit: 88a9b53d645e580fcae00936e73f18a6c0729ddf Parents: 9496199 9440d15 Author: Josh Elser <els...@apache.org> Authored: Thu Jan 23 13:05:22 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Jan 23 13:05:22 2014 -0500 ---------------------------------------------------------------------- .../core/client/mapreduce/RangeInputSplit.java | 2 +- .../core/util/shell/commands/DUCommand.java | 4 +- .../core/client/mapreduce/InputFormatBase.java | 1634 ++++++++++++++++++ .../test/continuous/ContinuousVerify.java | 80 +- .../org/apache/accumulo/test/ShellServerIT.java | 112 +- 5 files changed, 1734 insertions(+), 98 deletions(-) ----------------------------------------------------------------------
