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/04/22 20:57:33 UTC
[6/7] storm git commit: Merge branch 'master' of
https://github.com/redsanket/storm into STORM-766
Merge branch 'master' of https://github.com/redsanket/storm into STORM-766
STORM-766: Include version info in the service page
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7c3f7816
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7c3f7816
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7c3f7816
Branch: refs/heads/master
Commit: 7c3f7816f9438ce914038327050a202876d413e5
Parents: 23ada76 7bd56ae
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Apr 22 13:49:25 2015 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Apr 22 13:49:25 2015 -0500
----------------------------------------------------------------------
storm-core/src/clj/backtype/storm/converter.clj | 7 +-
.../src/clj/backtype/storm/daemon/common.clj | 2 +-
.../src/clj/backtype/storm/daemon/nimbus.clj | 8 +-
.../clj/backtype/storm/daemon/supervisor.clj | 8 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 3 +-
.../storm/generated/ClusterWorkerHeartbeat.java | 1 +
.../storm/generated/SupervisorInfo.java | 116 +++++++++++++++++-
.../storm/generated/SupervisorSummary.java | 117 ++++++++++++++++++-
.../storm/generated/TopologySummary.java | 2 +-
storm-core/src/py/storm/ttypes.py | 32 ++++-
storm-core/src/storm.thrift | 3 +
.../public/templates/index-page-template.html | 6 +
.../test/clj/backtype/storm/cluster_test.clj | 4 +-
13 files changed, 288 insertions(+), 21 deletions(-)
----------------------------------------------------------------------