Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/14c84e6a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/14c84e6a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/14c84e6a Branch: refs/heads/master Commit: 14c84e6adba8027c38fa80a0a8837ff9c4fd20c2 Parents: 8b21fc8 16f1dbd Author: Eric C. Newton <[email protected]> Authored: Fri Dec 12 15:28:07 2014 -0500 Committer: Eric C. Newton <[email protected]> Committed: Fri Dec 12 15:28:07 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/monitor/Monitor.java | 10 ++++++++-- .../org/apache/accumulo/monitor/servlets/ScanServlet.java | 6 ++---- 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/14c84e6a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java ----------------------------------------------------------------------
