Merge branch 'agresch_logviewer_filter' of https://github.com/agresch/storm 
into STORM-3244

STORM-3244: allow logviewer to use independent filter settings from ui

This closes #2861


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/06a64949
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/06a64949
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/06a64949

Branch: refs/heads/master
Commit: 06a64949c8c5b764a33a10beb6088cdd8f182aa0
Parents: bfcbf2c e63dee6
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Oct 5 15:43:29 2018 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Oct 5 15:43:29 2018 -0500

----------------------------------------------------------------------
 SECURITY.md                                          |  4 +++-
 conf/defaults.yaml                                   |  2 ++
 docs/SECURITY.md                                     |  4 +++-
 .../src/main/java/org/apache/storm/DaemonConfig.java | 14 +++++++++++++-
 .../storm/daemon/logviewer/LogviewerServer.java      | 15 ++++++++-------
 5 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


Reply via email to