Merge branch '1.6.0-SNAPSHOT'

Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b9b15961
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b9b15961
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b9b15961

Branch: refs/heads/master
Commit: b9b15961d5d09091a1c6dd69a86ff7547f0fa011
Parents: c761b59 f37342b
Author: Eric Newton <[email protected]>
Authored: Mon Dec 16 19:12:23 2013 -0500
Committer: Eric Newton <[email protected]>
Committed: Mon Dec 16 19:12:23 2013 -0500

----------------------------------------------------------------------
 .../accumulo/server/problems/ProblemReports.java    | 16 ++++++++++------
 .../accumulo/monitor/servlets/BasicServlet.java     |  9 ---------
 .../accumulo/monitor/servlets/OperationServlet.java |  8 +-------
 .../accumulo/monitor/servlets/ProblemServlet.java   |  6 +++---
 4 files changed, 14 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


Reply via email to