Merge branch 'STORM-2500-1.x-merge' 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/9b4c1e93 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9b4c1e93 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9b4c1e93 Branch: refs/heads/1.x-branch Commit: 9b4c1e93e731cf1f0cc23b1aa1a1bbb4a68c6ea4 Parents: d81893b 9c26691 Author: Jungtaek Lim <[email protected]> Authored: Sat Aug 19 12:11:31 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sat Aug 19 12:11:31 2017 +0900 ---------------------------------------------------------------------- .../storm/pacemaker/pacemaker_state_factory.clj | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
