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/c7431092 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c7431092 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c7431092 Branch: refs/heads/1.8 Commit: c7431092e132e070c27e464b473100552255ba45 Parents: 9c11f72 0d41ec6 Author: Sean Busbey <bus...@cloudera.com> Authored: Mon Oct 17 14:41:50 2016 -0700 Committer: Sean Busbey <bus...@cloudera.com> Committed: Mon Oct 17 14:41:50 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/accumulo/monitor/servlets/trace/Basic.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c7431092/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Basic.java ----------------------------------------------------------------------
