Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3f596ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3f596ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3f596ea Branch: refs/heads/master Commit: c3f596eadc0946eb55dc16575c6b9be8e63f214e Parents: 2d99238 9036325 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Jan 27 09:01:54 2016 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Jan 27 09:01:54 2016 -0500 ---------------------------------------------------------------------- test/system/continuous/mapred-setup.sh | 25 ------------------------- test/system/continuous/run-moru.sh | 8 ++++++++ test/system/continuous/run-verify.sh | 6 +++++- 3 files changed, 13 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
