Merge branch 'master' of github.com:knusbaum/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2c6ab5aa Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2c6ab5aa Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2c6ab5aa Branch: refs/heads/master Commit: 2c6ab5aa68b8ac008ed3a1a379a997e881f1a4bc Parents: 03e6b84 469f025 Author: P. Taylor Goetz <[email protected]> Authored: Fri Feb 24 13:15:17 2017 -0500 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Feb 24 13:15:17 2017 -0500 ---------------------------------------------------------------------- .../storm/cluster/PaceMakerStateStorage.java | 34 ++++++++++++++++---- .../org/apache/storm/pacemaker/Pacemaker.java | 3 +- 2 files changed, 29 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
