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/29 22:58:47 UTC

[48/50] git commit: Merge branch 'netty-client-fix' of https://github.com/kishorvpatil/incubator-storm into STORM-406

Merge branch 'netty-client-fix' of https://github.com/kishorvpatil/incubator-storm into STORM-406

STORM-406: Fix for reconnect logic in netty client


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

Branch: refs/heads/security
Commit: 848a748c5a00de9fc24174b2f7ccb58e0fa393f7
Parents: c3a9a37 f1f5ecd
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue Jul 29 07:16:40 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue Jul 29 07:16:40 2014 -0500

----------------------------------------------------------------------
 conf/defaults.yaml                                     |  3 ++-
 .../src/jvm/backtype/storm/messaging/netty/Client.java | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------