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/04f48547 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04f48547 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04f48547 Branch: refs/heads/master Commit: 04f485478685fe6de591ce6390e9c5534c0f6084 Parents: 7b6834d 383bf6d Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Jan 22 12:14:48 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Jan 22 12:14:48 2014 -0500 ---------------------------------------------------------------------- test/system/continuous/mapred-setup.sh | 4 ---- 1 file changed, 4 deletions(-) ----------------------------------------------------------------------