Merge branch 'STORM-1764-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1418e41e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1418e41e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1418e41e Branch: refs/heads/1.0.x-branch Commit: 1418e41eed9dc899928beaf103e5ecb38dcdc027 Parents: eead213 c8d97d1 Author: Jungtaek Lim <[email protected]> Authored: Mon May 16 18:24:03 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon May 16 18:24:03 2016 +0900 ---------------------------------------------------------------------- .../apache/storm/pacemaker/PacemakerServer.java | 9 +++++++-- .../storm/pacemaker/codec/ThriftDecoder.java | 21 +++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
