You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/02/24 18:16:15 UTC
[06/11] storm git commit: Merge branch '1.x-branch' of
github.com:knusbaum/incubator-storm into 1.x-branch
Merge branch '1.x-branch' of github.com:knusbaum/incubator-storm 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/65f33fdc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/65f33fdc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/65f33fdc
Branch: refs/heads/1.x-branch
Commit: 65f33fdcb9b342c869ca8ef494fd836be2f2ebb7
Parents: ba9f0e0 ebed1c8
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Feb 24 13:11:48 2017 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Feb 24 13:11:48 2017 -0500
----------------------------------------------------------------------
.../src/clj/org/apache/storm/pacemaker/pacemaker.clj | 2 +-
.../storm/pacemaker/pacemaker_state_factory.clj | 15 ++++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------