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