You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/01/20 23:16:26 UTC
[3/4] storm git commit: Merge branch
'storm-1452-profiler-broken-by-default' of github.com:d2r/storm into
1.x-branch
Merge branch 'storm-1452-profiler-broken-by-default' of github.com:d2r/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/76462f2a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/76462f2a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/76462f2a
Branch: refs/heads/1.x-branch
Commit: 76462f2ae39c7701b3dc5d8508f3ab40a6dec8fd
Parents: 1bc0864 9b5a1bf
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 20 17:15:26 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 20 17:15:26 2016 -0500
----------------------------------------------------------------------
conf/defaults.yaml | 6 +-
.../clj/org/apache/storm/daemon/supervisor.clj | 5 +-
storm-core/src/clj/org/apache/storm/ui/core.clj | 123 ++++++++++---------
storm-core/src/jvm/org/apache/storm/Config.java | 4 +-
storm-core/src/ui/public/component.html | 2 +-
.../templates/component-page-template.html | 2 +
storm-dist/binary/src/main/assembly/binary.xml | 1 +
7 files changed, 83 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/76462f2a/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------