Merge branch '1.0.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/174f4862 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/174f4862 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/174f4862 Branch: refs/heads/1.0.x-branch Commit: 174f4862f175b57a1888e239800a6fdd43159089 Parents: 773cded 67dc361 Author: P. Taylor Goetz <ptgo...@gmail.com> Authored: Thu Feb 1 14:32:26 2018 -0500 Committer: P. Taylor Goetz <ptgo...@gmail.com> Committed: Thu Feb 1 14:32:26 2018 -0500 ---------------------------------------------------------------------- conf/defaults.yaml | 1 + storm-core/src/jvm/org/apache/storm/Config.java | 7 + .../org/apache/storm/utils/NimbusClient.java | 13 +- storm-core/src/ui/public/component.html | 22 +-- storm-core/src/ui/public/index.html | 146 +++++++++---------- storm-core/src/ui/public/topology.html | 22 +-- 6 files changed, 112 insertions(+), 99 deletions(-) ----------------------------------------------------------------------