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 2015/07/17 00:44:08 UTC
[8/8] storm git commit: Merge branch 'STORM-935'
Merge branch 'STORM-935'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/df25048c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/df25048c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/df25048c
Branch: refs/heads/master
Commit: df25048cbc0c9884cc558f6c6e4ca118a38f930d
Parents: 9f75a26 7c46c7d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 17 07:37:54 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 17 07:37:54 2015 +0900
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
pom.xml | 2 +-
storm-core/src/clj/backtype/storm/daemon/executor.clj | 1 +
storm-core/src/clj/backtype/storm/daemon/worker.clj | 2 ++
storm-core/src/clj/backtype/storm/disruptor.clj | 4 ++--
storm-core/src/jvm/backtype/storm/Config.java | 7 +++++++
.../src/jvm/backtype/storm/utils/DisruptorQueue.java | 13 ++++++++++---
.../jvm/backtype/storm/utils/DisruptorQueueTest.java | 2 +-
8 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------