Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/917de1fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/917de1fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/917de1fe Branch: refs/heads/develop Commit: 917de1fe9d550bc5ff13a8c63801016e5389ff4e Parents: 40e7e18 600463c Author: Steve Loughran <ste...@apache.org> Authored: Mon May 26 08:50:37 2014 +0200 Committer: Steve Loughran <ste...@apache.org> Committed: Mon May 26 08:50:37 2014 +0200 ---------------------------------------------------------------------- app-packages/hbase-v0_96/ganglia_metrics.json | 38 +++++++ app-packages/hbase-v0_96/jmx_metrics.json | 56 +++++++++++ app-packages/hbase-v0_96/metrics.json | 110 --------------------- 3 files changed, 94 insertions(+), 110 deletions(-) ----------------------------------------------------------------------
