You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by xi...@apache.org on 2017/07/20 14:10:07 UTC
[5/5] storm git commit: Merge branch 'STORM-2638' of
https://github.com/knusbaum/incubator-storm
Merge branch 'STORM-2638' of https://github.com/knusbaum/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5d93a864
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5d93a864
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5d93a864
Branch: refs/heads/master
Commit: 5d93a864459b2407fda95de4995ac316ddd49fe7
Parents: 8814bfa a9611ef
Author: Xin Wang <be...@163.com>
Authored: Thu Jul 20 22:09:25 2017 +0800
Committer: Xin Wang <be...@163.com>
Committed: Thu Jul 20 22:09:25 2017 +0800
----------------------------------------------------------------------
conf/defaults.yaml | 1 +
.../src/jvm/org/apache/storm/Config.java | 7 +++++
.../apache/storm/pacemaker/PacemakerClient.java | 5 +++-
.../storm/pacemaker/codec/ThriftDecoder.java | 31 ++++++++++++++++----
.../pacemaker/codec/ThriftNettyClientCodec.java | 7 +++--
.../apache/storm/pacemaker/PacemakerServer.java | 6 ++--
.../pacemaker/codec/ThriftNettyServerCodec.java | 8 +++--
7 files changed, 52 insertions(+), 13 deletions(-)
----------------------------------------------------------------------