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/01/10 01:39:59 UTC

[3/4] storm git commit: Merge branch 'STORM-2278-1.x' into 1.x-branch

Merge branch 'STORM-2278-1.x' 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/58236f61
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/58236f61
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/58236f61

Branch: refs/heads/1.x-branch
Commit: 58236f6166b50f8cc594cc7f0248df3d19e2611b
Parents: 6b4d1a2 ce43a24
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Jan 10 10:38:57 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Jan 10 10:38:57 2017 +0900

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/Config.java | 11 ++++++++++
 .../org/apache/storm/utils/DisruptorQueue.java  | 21 +++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------