Merge branch '1.0.x-branch' of github.com:knusbaum/incubator-storm 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/dbc48680 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dbc48680 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dbc48680 Branch: refs/heads/1.0.x-branch Commit: dbc486803b72fa95d3267c693c912f01d4c12fef Parents: 38e4c64 a6b9668 Author: P. Taylor Goetz <[email protected]> Authored: Fri Feb 24 13:13:38 2017 -0500 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Feb 24 13:13:38 2017 -0500 ---------------------------------------------------------------------- .../org/apache/storm/pacemaker/pacemaker.clj | 2 +- .../storm/pacemaker/pacemaker_state_factory.clj | 24 ++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
