You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/10/30 22:18:01 UTC
[10/12] storm git commit: Merge branch '1144' of
https://github.com/zhuoliu/storm into STORM-1144
Merge branch '1144' of https://github.com/zhuoliu/storm into STORM-1144
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/090991dd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/090991dd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/090991dd
Branch: refs/heads/master
Commit: 090991ddde328a23554421e4ea89b77f80fb057f
Parents: a0f3412 9b9efc4
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri Oct 30 16:07:50 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Fri Oct 30 16:07:50 2015 -0500
----------------------------------------------------------------------
STORM-UI-REST-API.md | 19 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 26 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 16 +-
.../backtype/storm/generated/TopologyInfo.java | 604 ++++++++-
.../storm/generated/TopologyPageInfo.java | 606 ++++++++-
.../storm/generated/TopologySummary.java | 606 ++++++++-
.../jvm/backtype/storm/scheduler/Cluster.java | 16 +-
.../storm/scheduler/TopologyDetails.java | 51 +
.../resource/ResourceAwareScheduler.java | 38 +-
storm-core/src/py/storm/ttypes.py | 1145 +++++++++++++++---
storm-core/src/storm.thrift | 18 +
storm-core/src/ui/public/index.html | 6 +-
.../public/templates/index-page-template.html | 18 +-
.../templates/topology-page-template.html | 60 +
storm-core/src/ui/public/topology.html | 8 +
.../scheduler/resource_aware_scheduler_test.clj | 38 +-
16 files changed, 3018 insertions(+), 257 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/090991dd/storm-core/src/clj/backtype/storm/ui/core.clj
----------------------------------------------------------------------