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:25:52 UTC

[1/3] storm git commit: [STORM-2627] The annotation of storm.zookeeper.topology.auth.scheme in Config.java is wrong

Repository: storm
Updated Branches:
  refs/heads/master 36e2e99e3 -> 3512ae97f


[STORM-2627] The annotation of storm.zookeeper.topology.auth.scheme in Config.java is wrong


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/67d41fc8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/67d41fc8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/67d41fc8

Branch: refs/heads/master
Commit: 67d41fc89ea7c056b1c1233ecd235d789d6df482
Parents: 8ba90e9
Author: liuzhaokun <li...@zte.com.cn>
Authored: Thu Jul 20 09:14:11 2017 +0800
Committer: 刘兆坤10206665 <li...@zte.com.cn>
Committed: Thu Jul 20 09:14:11 2017 +0800

----------------------------------------------------------------------
 storm-client/src/jvm/org/apache/storm/Config.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/67d41fc8/storm-client/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/Config.java b/storm-client/src/jvm/org/apache/storm/Config.java
index 5d5f723..1c9e7a3 100644
--- a/storm-client/src/jvm/org/apache/storm/Config.java
+++ b/storm-client/src/jvm/org/apache/storm/Config.java
@@ -967,7 +967,7 @@ public class Config extends HashMap<String, Object> {
     public static final String STORM_ZOOKEEPER_SUPERACL = "storm.zookeeper.superACL";
 
     /**
-     * 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";


[2/3] storm git commit: Merge branch 'master07131533' of https://github.com/liu-zhaokun/storm into STORM-2627

Posted by bo...@apache.org.
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/72eae02f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/72eae02f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/72eae02f

Branch: refs/heads/master
Commit: 72eae02fa5079d8a9f0b1e927bc9ca3c919b7858
Parents: 36e2e99 67d41fc
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:23:41 2017 -0500

----------------------------------------------------------------------
 storm-client/src/jvm/org/apache/storm/Config.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/72eae02f/storm-client/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------


[3/3] 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/3512ae97
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3512ae97
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3512ae97

Branch: refs/heads/master
Commit: 3512ae97fdb6b846afe67f4bd097b488c658e51d
Parents: 72eae02
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:25:23 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/3512ae97/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eacc992..ca973d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -480,6 +480,7 @@
  * STORM-1868: Modify TridentKafkaWordCount to run in distributed mode
 
 ## 1.0.4
+ * STORM-2627: Update docs for storm.zookeeper.topology.auth.scheme
  * STORM-2597: Don't parse passed in class paths
  * STORM-2450: Write resources into correct local director
  * STORM-2038: No symlinks for local cluster