Merge branch '1696b' of https://github.com/zhuoliu/storm into STORM-1696
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/34d95156 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/34d95156 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/34d95156 Branch: refs/heads/master Commit: 34d95156dbec702d1ea5d20b2c9247e88fbb717e Parents: 6cf8a9c 63518be Author: Jungtaek Lim <[email protected]> Authored: Fri Apr 15 11:43:23 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Fri Apr 15 11:43:23 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/34d95156/storm-core/src/jvm/org/apache/storm/utils/DisruptorQueue.java ----------------------------------------------------------------------
