Merge branch 'STORM-497' of https://github.com/revans2/incubator-storm into 
storm-497


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

Branch: refs/heads/security
Commit: a73a74aab09c42398994fcfbbde55109a0c10001
Parents: 5a46038 f259f1d
Author: root <root@IDHV22-04.(none)>
Authored: Tue Nov 4 09:26:26 2014 +0800
Committer: root <root@IDHV22-04.(none)>
Committed: Tue Nov 4 09:26:26 2014 +0800

----------------------------------------------------------------------
 .../jvm/backtype/storm/messaging/netty/Server.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


Reply via email to