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/15055b49 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/15055b49 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/15055b49 Branch: refs/heads/master Commit: 15055b49de305f07fd131aa20f6f3b3e9dc7d4b7 Parents: a351610 f630f6a Author: Josh Elser <[email protected]> Authored: Wed Jun 21 12:21:24 2017 -0400 Committer: Josh Elser <[email protected]> Committed: Wed Jun 21 12:21:24 2017 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/monitor/servlets/trace/BasicTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
