Merge branch 'STORM-2983' of https://github.com/Ethanlm/storm into STORM-2983-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/282a68af Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/282a68af Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/282a68af Branch: refs/heads/master Commit: 282a68af094f49a3f297b6a19eb80ab765f6fa0a Parents: 5e69300 5516f29 Author: Jungtaek Lim <[email protected]> Authored: Thu Apr 5 22:06:55 2018 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Thu Apr 5 22:06:55 2018 +0900 ---------------------------------------------------------------------- .../src/jvm/org/apache/storm/daemon/worker/Worker.java | 9 +++++++-- .../src/jvm/org/apache/storm/daemon/worker/WorkerState.java | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
