Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5ccb54ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5ccb54ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5ccb54ea Branch: refs/heads/master Commit: 5ccb54eae9bc98aac6ccf8e2ad704a836722118b Parents: af5a37d 0a8ec61 Author: Josh Elser <els...@apache.org> Authored: Mon Aug 24 13:03:12 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Aug 24 13:03:12 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/5ccb54ea/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ----------------------------------------------------------------------
