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/04/15 04:54:11 UTC

[2/3] storm git commit: Merge branch 'STORM-1696-1.x-branch' of https://github.com/zhuoliu/storm into STORM-1696-1.x

Merge branch 'STORM-1696-1.x-branch' of https://github.com/zhuoliu/storm into STORM-1696-1.x


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

Branch: refs/heads/1.x-branch
Commit: bd553198f96528dd7fb637601ad8925d5339552b
Parents: b511a8b 9271056
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 15 11:53:04 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 15 11:53:04 2016 +0900

----------------------------------------------------------------------
 .../src/clj/org/apache/storm/daemon/worker.clj   | 19 +++++++++++--------
 .../org/apache/storm/utils/DisruptorQueue.java   |  8 ++++++--
 2 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/bd553198/storm-core/src/jvm/org/apache/storm/utils/DisruptorQueue.java
----------------------------------------------------------------------