You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/11/23 22:08:05 UTC
[26/37] storm git commit: Minor tweaks to documentation.
Minor tweaks to documentation.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8c1ad3fb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8c1ad3fb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8c1ad3fb
Branch: refs/heads/master
Commit: 8c1ad3fb374f1f6311b9853c1c18820834e1f204
Parents: 37768ef
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Tue Nov 17 15:50:38 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Tue Nov 17 15:50:38 2015 -0600
----------------------------------------------------------------------
docs/documentation/Pacemaker.md | 2 +-
storm-core/src/jvm/backtype/storm/Config.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8c1ad3fb/docs/documentation/Pacemaker.md
----------------------------------------------------------------------
diff --git a/docs/documentation/Pacemaker.md b/docs/documentation/Pacemaker.md
index 06f2fa1..a9df08d 100644
--- a/docs/documentation/Pacemaker.md
+++ b/docs/documentation/Pacemaker.md
@@ -14,7 +14,7 @@ The corresponding Pacemaker client is a plugin for the `ClusterState` interface,
- `pacemaker.host` : The host that the Pacemaker daemon is running on
- `pacemaker.port` : The port that Pacemaker will listen on
- `pacemaker.max.threads` : Maximum number of threads Pacemaker daemon will use to handle requests.
- - `pacemaker.childopts` : Any JVM parameters that need to go to the Pacemaker.
+ - `pacemaker.childopts` : Any JVM parameters that need to go to the Pacemaker. (used by storm-deploy project)
- `pacemaker.auth.method` : The authentication method that is used (more info below)
#### Example
http://git-wip-us.apache.org/repos/asf/storm/blob/8c1ad3fb/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index 7e441c5..ee7533b 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -816,7 +816,7 @@ public class Config extends HashMap<String, Object> {
/**
* This parameter is used by the storm-deploy project to configure the
- * jvm options for the nimbus daemon.
+ * jvm options for the pacemaker daemon.
*/
@isString
public static final String PACEMAKER_CHILDOPTS = "pacemaker.childopts";