You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/01/22 09:28:21 UTC

[2/2] storm git commit: Merge branch 'STORM-2862-1.1.x' of https://github.com/hmcc/storm into STORM-2862-1.1.x-merge

Merge branch 'STORM-2862-1.1.x' of https://github.com/hmcc/storm into STORM-2862-1.1.x-merge


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

Branch: refs/heads/1.1.x-branch
Commit: 9b6d157358410bdee46412ff17ab81ff1919e64c
Parents: f7b8bb2 dc65d3b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Jan 22 18:28:01 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Jan 22 18:28:01 2018 +0900

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/Config.java |   8 ++
 .../jvm/org/apache/storm/spout/ShellSpout.java  |  37 ++----
 .../jvm/org/apache/storm/task/ShellBolt.java    |  38 ++-----
 .../storm/utils/DefaultShellLogHandler.java     | 113 +++++++++++++++++++
 .../org/apache/storm/utils/ShellLogHandler.java |  52 +++++++++
 .../jvm/org/apache/storm/utils/ShellUtils.java  |  17 +++
 .../storm/utils/DefaultShellLogHandlerTest.java | 105 +++++++++++++++++
 .../org/apache/storm/utils/ShellUtilsTest.java  | 103 +++++++++++++++++
 8 files changed, 413 insertions(+), 60 deletions(-)
----------------------------------------------------------------------