Merge branch 'STORM-2862' of https://github.com/hmcc/storm into STORM-2862-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/05771baf Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/05771baf Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/05771baf Branch: refs/heads/master Commit: 05771bafaf6a11631867c457b8af53c8b9955734 Parents: 507e7ed 20044b0 Author: Jungtaek Lim <[email protected]> Authored: Mon Jan 22 18:26:58 2018 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Jan 22 18:26:58 2018 +0900 ---------------------------------------------------------------------- .../src/jvm/org/apache/storm/Config.java | 8 ++ .../jvm/org/apache/storm/spout/ShellSpout.java | 36 ++---- .../jvm/org/apache/storm/task/ShellBolt.java | 38 ++----- .../storm/utils/DefaultShellLogHandler.java | 112 +++++++++++++++++++ .../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, 412 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
