You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/07/21 15:29:09 UTC
[1/2] storm git commit: Merge branch 'master07131533' of
https://github.com/liu-zhaokun/storm into STORM-2627
Repository: storm
Updated Branches:
refs/heads/1.x-branch 6aa64ea38 -> 0f31560ac
Merge branch 'master07131533' of https://github.com/liu-zhaokun/storm into STORM-2627
STORM-2627: Update docs for storm.zookeeper.topology.auth.scheme
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8c4a1239
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8c4a1239
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8c4a1239
Branch: refs/heads/1.x-branch
Commit: 8c4a12394c5a0d569b7c698c8ec71641274bd0d8
Parents: 6aa64ea
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Jul 21 10:23:41 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Jul 21 10:28:05 2017 -0500
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/Config.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8c4a1239/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java
index 43df951..467bea6 100644
--- a/storm-core/src/jvm/org/apache/storm/Config.java
+++ b/storm-core/src/jvm/org/apache/storm/Config.java
@@ -384,7 +384,7 @@ public class Config extends HashMap<String, Object> {
public static final String STORM_ZOOKEEPER_AUTH_PAYLOAD="storm.zookeeper.auth.payload";
/**
- * The topology Zookeeper authentication scheme to use, e.g. "digest". Defaults to no authentication.
+ * The topology Zookeeper authentication scheme to use, e.g. "digest". It is the internal config and user shouldn't set it.
*/
@isString
public static final String STORM_ZOOKEEPER_TOPOLOGY_AUTH_SCHEME="storm.zookeeper.topology.auth.scheme";
@@ -2497,4 +2497,4 @@ public class Config extends HashMap<String, Object> {
this.put(Config.TOPOLOGY_SCHEDULER_STRATEGY, clazz.getName());
}
}
-}
\ No newline at end of file
+}
[2/2] storm git commit: Added STORM-2627 into changelog
Posted by bo...@apache.org.
Added STORM-2627 into changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0f31560a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0f31560a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0f31560a
Branch: refs/heads/1.x-branch
Commit: 0f31560ac61c36acc9f2c3c7bb20b31eae5c2695
Parents: 8c4a123
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Fri Jul 21 10:25:23 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Fri Jul 21 10:28:35 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0f31560a/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a4e796..14b4455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -262,6 +262,7 @@
* STORM-1720: Support GEO in storm-redis
## 1.0.4
+ * STORM-2627: Update docs for storm.zookeeper.topology.auth.scheme
* STORM-2597: Don't parse passed in class paths
* STORM-2524: Set Kafka client.id with storm-kafka
* STORM-2450: Write resources into correct local director