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/c98c0927 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c98c0927 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c98c0927 Branch: refs/heads/master Commit: c98c0927585597064a561caf3a5ec169d2db299d Parents: 88a9b53 27be9fb Author: Josh Elser <els...@apache.org> Authored: Thu Jan 23 21:14:45 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Jan 23 21:14:45 2014 -0500 ---------------------------------------------------------------------- .../core/client/impl/OfflineScanner.java | 15 +- .../core/client/mapreduce/RangeInputSplit.java | 11 +- .../mapreduce/lib/util/ConfiguratorBase.java | 11 +- .../core/client/mapreduce/InputFormatBase.java | 1634 ------------------ .../test/continuous/ContinuousVerify.java | 21 - .../test/functional/ConfigurableMacIT.java | 3 +- test/system/continuous/run-verify.sh | 24 +- 7 files changed, 16 insertions(+), 1703 deletions(-) ----------------------------------------------------------------------
