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/06/09 15:48:37 UTC

[32/32] git commit: Merge branch 'storm_async_netty_and_batch_api' of https://github.com/clockfly/incubator-storm into STORM-297

Merge branch 'storm_async_netty_and_batch_api' of https://github.com/clockfly/incubator-storm into STORM-297

Pulled in test fixes for STORM-297


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

Branch: refs/heads/master
Commit: 1a57fcf6b015c23f56aea896397bca03fc109ead
Parents: e21642d 23f5724
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Mon Jun 9 08:35:29 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Mon Jun 9 08:35:29 2014 -0500

----------------------------------------------------------------------
 .../storm/testing/TestEventLogSpout.java        | 60 +++++++++++++++-----
 .../backtype/storm/utils/TransferDrainer.java   |  2 +-
 2 files changed, 48 insertions(+), 14 deletions(-)
----------------------------------------------------------------------