Merge branch '1.1.x-branch' of https://github.com/ZacharyThomas/storm into STORM-2500-1.1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c859d95e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c859d95e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c859d95e Branch: refs/heads/1.1.x-branch Commit: c859d95e8913f32d69eea7bf5ccae1ebc2b6be61 Parents: 9c4e34a c82c849 Author: Jungtaek Lim <[email protected]> Authored: Sat Aug 19 12:10:39 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Sat Aug 19 12:10:39 2017 +0900 ---------------------------------------------------------------------- .../storm/pacemaker/pacemaker_state_factory.clj | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
