You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/02/01 15:30:38 UTC

[2/2] storm git commit: Merge branch 'STORM-2877-1.1.x-merge' into 1.1.x-branch

Merge branch 'STORM-2877-1.1.x-merge' into 1.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/eb63a842
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/eb63a842
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/eb63a842

Branch: refs/heads/1.1.x-branch
Commit: eb63a842c943762e3d3cb63c61471f2f4bdfe795
Parents: f94ecf9 f327c98
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Feb 2 00:29:53 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Feb 2 00:29:53 2018 +0900

----------------------------------------------------------------------
 conf/defaults.yaml                              |   1 +
 storm-core/src/jvm/org/apache/storm/Config.java |   7 +
 storm-core/src/ui/public/component.html         |  22 +--
 storm-core/src/ui/public/index.html             | 148 +++++++++----------
 storm-core/src/ui/public/topology.html          |  22 +--
 5 files changed, 106 insertions(+), 94 deletions(-)
----------------------------------------------------------------------