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/04/01 18:47:17 UTC

[4/5] storm git commit: Merge branch 'STORM-1632' of github.com:roshannaik/storm into 1.x-branch

Merge branch 'STORM-1632' of github.com:roshannaik/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/b15e6ab7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b15e6ab7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b15e6ab7

Branch: refs/heads/1.x-branch
Commit: b15e6ab79a671590b878530b9734233d3a77f59b
Parents: dc006da 7d7b3c2
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 1 12:35:54 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 1 12:35:54 2016 -0400

----------------------------------------------------------------------
 conf/defaults.yaml                                |  2 +-
 storm-core/src/ui/public/component.html           | 18 +++++++++++++++++-
 storm-core/src/ui/public/js/script.js             | 10 ++++++----
 .../public/templates/component-page-template.html |  8 +++++++-
 .../public/templates/topology-page-template.html  |  8 +++++++-
 storm-core/src/ui/public/topology.html            |  2 +-
 6 files changed, 39 insertions(+), 9 deletions(-)
----------------------------------------------------------------------