Merge branch 'feature/SLIDER-319-codahale-phase-3' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/165b44b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/165b44b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/165b44b7 Branch: refs/heads/develop Commit: 165b44b776a4451cfdfa54f0c8cbd12a5538dcab Parents: a3b6fa5 35935db Author: Steve Loughran <[email protected]> Authored: Wed Nov 26 15:35:48 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Nov 26 15:35:48 2014 +0000 ---------------------------------------------------------------------- .../server/appmaster/RoleLaunchService.java | 2 +- .../management/MetricsBindingService.java | 113 +++++++++++-------- .../appmaster/management/MetricsKeys.java | 93 +++++++++++++++ .../server/appmaster/web/rest/RestPaths.java | 1 + .../server/appmaster/web/view/NavBlock.java | 1 + .../standalone/TestStandaloneAgentWeb.groovy | 25 ++-- 6 files changed, 167 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
