Merge branch 'master' of https://github.com/knusbaum/incubator-storm into STORM-1764
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/354fcaf6 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/354fcaf6 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/354fcaf6 Branch: refs/heads/master Commit: 354fcaf64567f3332b3311681308a841ee83cf34 Parents: 6ff3fb2 2fa4d25 Author: Jungtaek Lim <[email protected]> Authored: Mon May 16 18:16:25 2016 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon May 16 18:16:25 2016 +0900 ---------------------------------------------------------------------- .../apache/storm/pacemaker/PacemakerServer.java | 9 +++++++-- .../storm/pacemaker/codec/ThriftDecoder.java | 21 +++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
