You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/10/30 03:28:11 UTC
[4/6] storm git commit: Merge branch '901' of
https://github.com/zhuoliu/storm into STORM-901
Merge branch '901' of https://github.com/zhuoliu/storm into STORM-901
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/62c40348
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/62c40348
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/62c40348
Branch: refs/heads/master
Commit: 62c40348ffdac1844067307f6b595633b1addac7
Parents: b6615d5 ce97de3
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Oct 29 21:23:40 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Oct 29 21:23:40 2015 -0500
----------------------------------------------------------------------
conf/defaults.yaml | 2 +
log4j2/worker.xml | 12 +-
storm-core/src/clj/backtype/storm/config.clj | 19 +
.../src/clj/backtype/storm/daemon/logviewer.clj | 514 ++++++++++++++-----
.../clj/backtype/storm/daemon/supervisor.clj | 19 +-
storm-core/src/clj/backtype/storm/ui/core.clj | 29 +-
.../src/clj/backtype/storm/ui/helpers.clj | 26 +-
storm-core/src/clj/backtype/storm/util.clj | 41 +-
storm-core/src/jvm/backtype/storm/Config.java | 12 +
.../storm/metric/FileBasedEventLogger.java | 18 +-
.../src/jvm/backtype/storm/utils/Utils.java | 69 +++
.../test/clj/backtype/storm/logviewer_test.clj | 312 +++++++----
.../test/clj/backtype/storm/supervisor_test.clj | 210 ++++----
13 files changed, 880 insertions(+), 403 deletions(-)
----------------------------------------------------------------------