[
https://issues.apache.org/jira/browse/STORM-1397?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15062275#comment-15062275
]
ASF GitHub Bot commented on STORM-1397:
---------------------------------------
GitHub user knusbaum reopened a pull request:
https://github.com/apache/storm/pull/951
STORM-1397: Merge conflict from Pacemaker merge
When Pacemaker was merged, some calls got missed in nimbus.clj,
supervisor.clj, worker.clj and executor.clj.
This merge error prevents nimbus from spawning separate read/write
zookeeper clients since the ClusterState ends up with daemonType ==
DaemonType.UNKNOWN.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/knusbaum/incubator-storm STORM-1397
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/951.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #951
----
commit 96939d49ff83c99b200c47dd5e077e270a36909a
Author: Kyle Nusbaum <[email protected]>
Date: 2015-12-16T22:46:33Z
Adding context
commit 6c95887945bd7fe845b9d399b5969d52cf7295da
Author: Kyle Nusbaum <[email protected]>
Date: 2015-12-16T23:00:51Z
Fixing missing includes.
----
> Merge conflict from Pacemaker merge
> -----------------------------------
>
> Key: STORM-1397
> URL: https://issues.apache.org/jira/browse/STORM-1397
> Project: Apache Storm
> Issue Type: Bug
> Reporter: Kyle Nusbaum
>
> When Pacemaker was merged, some calls got missed in nimbus.clj,
> supervisor.clj, worker.clj and executor.clj.
> This merge error prevents nimbus from spawning separate read/write zookeeper
> clients since the ClusterState ends up with daemonType == DaemonType.UNKNOWN.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
