Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e3b0412e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3b0412e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3b0412e Branch: refs/heads/master Commit: e3b0412e1e29d8e66b621ceb44845e5ec7e40186 Parents: 6104c98 7f329a9 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Sep 11 15:18:06 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Sep 11 15:18:06 2014 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/monitor/Monitor.java | 65 +++++++++++++++++- .../accumulo/monitor/servlets/BasicServlet.java | 1 + .../accumulo/monitor/servlets/ScanServlet.java | 72 ++++++++++++++++++++ 3 files changed, 136 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e3b0412e/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e3b0412e/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java ----------------------------------------------------------------------
