You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/05/26 17:53:31 UTC

[07/12] accumulo git commit: Merge branch '1.7'

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/2498a5f3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2498a5f3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2498a5f3

Branch: refs/heads/master
Commit: 2498a5f34ab704ad71a604f19d8dc0098df5b4b7
Parents: add53da 9b1620c
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue May 26 11:36:21 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue May 26 11:36:21 2015 -0400

----------------------------------------------------------------------
 .../org/apache/accumulo/monitor/Monitor.java    | 22 ++++++++++++++++++++
 .../accumulo/monitor/servlets/BasicServlet.java | 21 +------------------
 2 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------