Merge branch 'STORM-2979-1.x-merge' into 1.x-branch

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

Branch: refs/heads/1.x-branch
Commit: 66837b2a3bf2a48612c812317cec1efbeeac57d9
Parents: 0f22779 5e305de
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Wed Apr 11 21:34:58 2018 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Wed Apr 11 21:34:58 2018 +0900

----------------------------------------------------------------------
 .../src/clj/org/apache/storm/daemon/worker.clj  | 29 ++++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


Reply via email to