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 2017/08/19 02:22:06 UTC

[2/2] storm git commit: Merge branch 'STORM-2682-1.0.x' of https://github.com/revans2/incubator-storm into STORM-2682-1.0.x-merge

Merge branch 'STORM-2682-1.0.x' of https://github.com/revans2/incubator-storm into STORM-2682-1.0.x-merge


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

Branch: refs/heads/1.0.x-branch
Commit: f7696c022425ba6d53d22ea3bd76c67525417eb7
Parents: 51c84ba 457bdf4
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Aug 19 10:57:48 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Aug 19 10:57:48 2017 +0900

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/daemon/supervisor/Slot.java | 11 +++++++++++
 .../storm/daemon/supervisor/timer/UpdateBlobs.java       | 11 ++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------