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 2016/09/29 14:20:50 UTC
[7/8] storm git commit: Merge branch
'STORM-2124_show_requested_cpu_mem_for_each_component_1x' of
https://github.com/abellina/storm into STORM-2124-1.x
Merge branch 'STORM-2124_show_requested_cpu_mem_for_each_component_1x' of https://github.com/abellina/storm into STORM-2124-1.x
STORM-2124: show requested cpu mem for each component
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5e908676
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5e908676
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5e908676
Branch: refs/heads/1.x-branch
Commit: 5e908676e2febe79aa5c782c6e6b1b50979146bc
Parents: 854c142 abc98ad
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Sep 28 13:11:15 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Sep 28 13:11:15 2016 -0500
----------------------------------------------------------------------
docs/STORM-UI-REST-API.md | 94 ++-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 28 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 9 +-
.../org/apache/storm/generated/Assignment.java | 244 +++---
.../storm/generated/ClusterWorkerHeartbeat.java | 52 +-
.../storm/generated/CommonAggregateStats.java | 166 +++-
.../storm/generated/ComponentPageInfo.java | 386 +++++++---
.../org/apache/storm/generated/Credentials.java | 44 +-
.../jvm/org/apache/storm/generated/HBNodes.java | 32 +-
.../org/apache/storm/generated/HBRecords.java | 36 +-
.../storm/generated/LSApprovedWorkers.java | 44 +-
.../generated/LSSupervisorAssignments.java | 48 +-
.../apache/storm/generated/LSTopoHistory.java | 64 +-
.../storm/generated/LSTopoHistoryList.java | 36 +-
.../storm/generated/LSWorkerHeartbeat.java | 36 +-
.../apache/storm/generated/ListBlobsResult.java | 32 +-
.../apache/storm/generated/LocalAssignment.java | 36 +-
.../apache/storm/generated/LocalStateData.java | 48 +-
.../org/apache/storm/generated/LogConfig.java | 48 +-
.../jvm/org/apache/storm/generated/Nimbus.java | 36 +-
.../org/apache/storm/generated/NodeInfo.java | 32 +-
.../storm/generated/RebalanceOptions.java | 44 +-
.../storm/generated/SettableBlobMeta.java | 36 +-
.../org/apache/storm/generated/StormBase.java | 92 +--
.../apache/storm/generated/SupervisorInfo.java | 152 ++--
.../storm/generated/SupervisorPageInfo.java | 72 +-
.../storm/generated/TopologyHistoryInfo.java | 32 +-
.../storm/generated/TopologyPageInfo.java | 132 ++--
.../apache/storm/generated/TopologyStats.java | 220 +++---
.../apache/storm/generated/WorkerSummary.java | 44 +-
storm-core/src/py/storm/Nimbus.py | 14 +-
storm-core/src/py/storm/ttypes.py | 756 ++++++++++---------
storm-core/src/storm.thrift | 2 +
.../templates/component-page-template.html | 22 +
.../templates/topology-page-template.html | 102 ++-
storm-core/src/ui/public/topology.html | 6 +-
36 files changed, 1900 insertions(+), 1377 deletions(-)
----------------------------------------------------------------------