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:15:47 UTC
[45/46] storm git commit: Merge branch
'storm-1452-profiler-broken-by-default' of github.com:d2r/storm
Merge branch 'storm-1452-profiler-broken-by-default' of github.com:d2r/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/93a66b8f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/93a66b8f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/93a66b8f
Branch: refs/heads/master
Commit: 93a66b8f456d64074d46d014b6e65d42dcb6d311
Parents: c90021f 9b5a1bf
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 20 17:13:42 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 20 17:13:42 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/93a66b8f/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------