Merge branch 'STORM-2862-1.x' of https://github.com/hmcc/storm into STORM-2862-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/25fa9dd7 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/25fa9dd7 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/25fa9dd7 Branch: refs/heads/1.x-branch Commit: 25fa9dd7cc2bcb63460d37dcb317b1f55bf10496 Parents: f10fefc 5f595cb Author: Jungtaek Lim <[email protected]> Authored: Mon Jan 22 18:27:33 2018 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Jan 22 18:27:33 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(-) ----------------------------------------------------------------------
