You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/07/31 02:23:22 UTC

[7/8] git commit: Merge branch 'disruptor-update' of https://github.com/miofthena/incubator-storm into STORM-350

Merge branch 'disruptor-update' of https://github.com/miofthena/incubator-storm into STORM-350

STORM-350: LMAX Disruptor 3.2.1


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

Branch: refs/heads/master
Commit: 78c5e231f679c84d14258d190c8658f8d0b98ad3
Parents: 9ac0111 8c4684c
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Wed Jul 30 19:17:05 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Wed Jul 30 19:17:05 2014 -0500

----------------------------------------------------------------------
 pom.xml                                         |  4 +-
 storm-core/pom.xml                              |  2 +-
 storm-core/src/clj/backtype/storm/disruptor.clj | 11 ++--
 .../backtype/storm/utils/DisruptorQueue.java    | 56 ++++++++++----------
 .../storm/utils/DisruptorQueueTest.java         | 25 +++++----
 5 files changed, 48 insertions(+), 50 deletions(-)
----------------------------------------------------------------------