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.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
