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/0e217844 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0e217844 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0e217844 Branch: refs/heads/master Commit: 0e2178447cff9da97fbec9ab5e4481915233c0e4 Parents: 7d28401 fc4e983 Author: Josh Elser <els...@apache.org> Authored: Wed Jul 23 17:06:10 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Jul 23 17:06:10 2014 -0400 ---------------------------------------------------------------------- assemble/conf/templates/accumulo-metrics.xml | 4 --- docs/src/main/resources/metrics.html | 33 +---------------------- 2 files changed, 1 insertion(+), 36 deletions(-) ----------------------------------------------------------------------
