Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ca5928e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca5928e2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca5928e2 Branch: refs/heads/master Commit: ca5928e2089139cda395a82d3d201d3aab1d3231 Parents: fdd7d09 07672bd Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue May 26 16:45:33 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue May 26 16:45:33 2015 -0400 ---------------------------------------------------------------------- .../accumulo/monitor/EmbeddedWebServer.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
