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 2016/07/08 07:57:25 UTC

[2/3] storm git commit: Merge branch 'STORM-1742'

Merge branch 'STORM-1742'


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

Branch: refs/heads/master
Commit: 772fcc25cd2f145f34d55a43c6979f883b1efc0f
Parents: 1134d73 63fed3b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 8 16:55:56 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 8 16:55:56 2016 +0900

----------------------------------------------------------------------
 storm-core/src/clj/org/apache/storm/daemon/executor.clj |  3 ++-
 storm-core/src/jvm/org/apache/storm/daemon/Acker.java   | 12 +++++++++---
 .../src/jvm/org/apache/storm/daemon/StormCommon.java    |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------