Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a351610e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a351610e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a351610e Branch: refs/heads/1.8 Commit: a351610eaba120854d9c3c5784e22f8dd2715461 Parents: 97c70da 6f18782 Author: Josh Elser <els...@apache.org> Authored: Wed Jun 21 11:03:08 2017 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Jun 21 11:03:08 2017 -0400 ---------------------------------------------------------------------- .../main/asciidoc/chapters/administration.txt | 5 ++ server/monitor/pom.xml | 5 ++ .../accumulo/monitor/servlets/trace/Basic.java | 2 +- .../monitor/servlets/trace/BasicTest.java | 55 ++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a351610e/docs/src/main/asciidoc/chapters/administration.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a351610e/server/monitor/pom.xml ----------------------------------------------------------------------
