Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9e3d4a7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9e3d4a7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9e3d4a7e Branch: refs/heads/master Commit: 9e3d4a7efbcd40b1660649244345c5e8c5fffddf Parents: 635f540 8d954e2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jun 8 20:40:51 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jun 8 20:40:51 2016 -0400 ---------------------------------------------------------------------- test/src/main/resources/log4j.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
