You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/11/20 23:26:38 UTC
[13/15] storm git commit: Merge branch '1198' of
https://github.com/zhuoliu/storm into STORM-1198
Merge branch '1198' of https://github.com/zhuoliu/storm into STORM-1198
STORM-1198: Web UI to show resource usages and Total Resources on all supervisors
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/06462862
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/06462862
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/06462862
Branch: refs/heads/master
Commit: 064628626f5268b1dc8537ac7cce408702672c0f
Parents: ab5b2f9 e58d254
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Fri Nov 20 16:06:06 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Fri Nov 20 16:06:06 2015 -0600
----------------------------------------------------------------------
conf/defaults.yaml | 2 +
docs/documentation/ui-rest-api.md | 14 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 11 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 17 +-
storm-core/src/jvm/backtype/storm/Config.java | 9 +
.../storm/generated/SupervisorSummary.java | 206 ++++++++++++++++++-
.../jvm/backtype/storm/scheduler/Cluster.java | 115 ++++++++++-
.../resource/ResourceAwareScheduler.java | 18 +-
.../src/jvm/backtype/storm/utils/Utils.java | 47 +++++
storm-core/src/py/storm/ttypes.py | 28 ++-
storm-core/src/storm.thrift | 2 +
.../public/templates/index-page-template.html | 36 ++++
.../templates/topology-page-template.html | 6 +
storm-core/src/ui/public/topology.html | 7 +-
14 files changed, 502 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/06462862/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------