You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2019/02/16 11:53:34 UTC

[storm] 01/02: Merge branch 'STORM-3330' of https://github.com/srdo/storm into asfgit-master

This is an automated email from the ASF dual-hosted git repository.

srdo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git

commit d93bce040627e606214288fc16ade2fb488e6cf4
Merge: 6bbe435 9df5de6
Author: Stig Rohde Døssing <sr...@apache.org>
AuthorDate: Sat Feb 16 12:51:08 2019 +0100

    Merge branch 'STORM-3330' of https://github.com/srdo/storm into asfgit-master

 .../storm/daemon/logviewer/LogviewerServer.java    |   4 +-
 .../logviewer/handler/LogviewerLogPageHandler.java |  18 +-
 .../handler/LogviewerLogSearchHandler.java         | 114 ++++----
 .../logviewer/handler/LogviewerProfileHandler.java |   8 +-
 .../daemon/logviewer/utils/DirectoryCleaner.java   |  78 +++---
 .../storm/daemon/logviewer/utils/LogCleaner.java   | 125 ++++-----
 .../storm/daemon/logviewer/utils/WorkerLogs.java   |  91 +++----
 .../logviewer/webapp/LogviewerApplication.java     |   5 +-
 .../daemon/logviewer/webapp/LogviewerResource.java |   2 +-
 .../handler/LogviewerLogPageHandlerTest.java       |   3 +-
 .../handler/LogviewerLogSearchHandlerTest.java     |  68 ++---
 .../daemon/logviewer/utils/LogCleanerTest.java     | 287 +++++++++------------
 .../daemon/logviewer/utils/WorkerLogsTest.java     |  28 +-
 13 files changed, 401 insertions(+), 430 deletions(-)