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/7e45a37d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e45a37d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e45a37d Branch: refs/heads/master Commit: 7e45a37d7c2ed78494d068ad42c13e55254a6c50 Parents: 7059d73 5ccb54e Author: Josh Elser <els...@apache.org> Authored: Mon Aug 24 13:03:19 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Aug 24 13:03:19 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/monitor/Monitor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e45a37d/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ----------------------------------------------------------------------
