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/e7c5e247 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7c5e247 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7c5e247 Branch: refs/heads/master Commit: e7c5e2474a82bb9ae6857187273cabc4cd13ddde Parents: 81393b8 15055b4 Author: Josh Elser <els...@apache.org> Authored: Wed Jun 21 12:43:08 2017 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Jun 21 12:43:08 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/monitor/servlets/trace/BasicTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
