Merge branch 'STORM-2757' of https://github.com/Ethanlm/storm into STORM-2757-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b5be1d6b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b5be1d6b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b5be1d6b Branch: refs/heads/master Commit: b5be1d6b0b42e42b527dc18665e529699b8c587c Parents: 9d5515a ab6abf9 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Thu Sep 28 16:17:03 2017 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Thu Sep 28 16:17:03 2017 +0900 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/ui/core.clj | 114 ++++++++++++------- .../src/ui/public/deep_search_result.html | 10 +- storm-core/src/ui/public/search_result.html | 6 +- .../deep-search-result-page-template.html | 2 +- .../templates/search-result-page-template.html | 4 +- .../java/org/apache/storm/DaemonConfig.java | 4 +- 6 files changed, 91 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
