You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by xi...@apache.org on 2017/04/19 01:40:33 UTC

[1/2] storm git commit: [STORM-2480] principle should be modified to principal

Repository: storm
Updated Branches:
  refs/heads/master 2307b8023 -> 7f1566cfc


[STORM-2480] principle should be modified to principal


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

Branch: refs/heads/master
Commit: 3d619678ca3a91012dc9dc9e9678826a1ed8cff7
Parents: c38d795
Author: liuzhaokun <li...@zte.com.cn>
Authored: Mon Apr 17 15:41:47 2017 +0800
Committer: \u5218\u5146\u576410206665 <li...@zte.com.cn>
Committed: Mon Apr 17 15:41:47 2017 +0800

----------------------------------------------------------------------
 docs/storm-hbase.md            | 2 +-
 docs/storm-hdfs.md             | 2 +-
 external/storm-hbase/README.md | 2 +-
 external/storm-hdfs/README.md  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/3d619678/docs/storm-hbase.md
----------------------------------------------------------------------
diff --git a/docs/storm-hbase.md b/docs/storm-hbase.md
index 1710e1b..a1b0764 100644
--- a/docs/storm-hbase.md
+++ b/docs/storm-hbase.md
@@ -46,7 +46,7 @@ provided for the storm-hbase connector. Specifically, the Config object passed i
 Config config = new Config();
 ...
 config.put("storm.keytab.file", "$keytab");
-config.put("storm.kerberos.principal", "$principle");
+config.put("storm.kerberos.principal", "$principal");
 StormSubmitter.submitTopology("$topologyName", config, builder.createTopology());
 ```
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3d619678/docs/storm-hdfs.md
----------------------------------------------------------------------
diff --git a/docs/storm-hdfs.md b/docs/storm-hdfs.md
index db99f4c..d2c7567 100644
--- a/docs/storm-hdfs.md
+++ b/docs/storm-hdfs.md
@@ -555,7 +555,7 @@ Only methods mentioned in **bold** are required.
 | .setLockTimeoutSec()       |~~hdfsspout.lock.timeout.sec~~        |  5 minutes  | Duration of inactivity after which a lock file is considered to be abandoned and ready for another spout to take ownership |
 | .setClocksInSync()         |~~hdfsspout.clocks.insync~~           |    true     | Indicates whether clocks on the storm machines are in sync (using services like NTP). Used for detecting stale locks. |
 | .withConfigKey()           |                                      |             | Optional setting. Overrides the default key name ('hdfs.config', see below) used for specifying HDFS client configs. |
-| .setHdfsClientSettings()   |~~hdfs.config~~ (unless changed via withConfigKey)| | Set it to a Map of Key/value pairs indicating the HDFS settings to be used. For example, keytab and principle could be set using this. See section **Using keytabs on all worker hosts** under HDFS bolt below.|
+| .setHdfsClientSettings()   |~~hdfs.config~~ (unless changed via withConfigKey)| | Set it to a Map of Key/value pairs indicating the HDFS settings to be used. For example, keytab and principal could be set using this. See section **Using keytabs on all worker hosts** under HDFS bolt below.|
 | .withOutputStream()        |                                      |             | Name of output stream. If set, the tuples will be emited to the specified stream. Else tuples will be emited to the default output stream |
 
 ---

http://git-wip-us.apache.org/repos/asf/storm/blob/3d619678/external/storm-hbase/README.md
----------------------------------------------------------------------
diff --git a/external/storm-hbase/README.md b/external/storm-hbase/README.md
index 95d5c6c..72d0f5f 100644
--- a/external/storm-hbase/README.md
+++ b/external/storm-hbase/README.md
@@ -42,7 +42,7 @@ provided for the storm-hbase connector. Specifically, the Config object passed i
 Config config = new Config();
 ...
 config.put("storm.keytab.file", "$keytab");
-config.put("storm.kerberos.principal", "$principle");
+config.put("storm.kerberos.principal", "$principal");
 StormSubmitter.submitTopology("$topologyName", config, builder.createTopology());
 ```
 

http://git-wip-us.apache.org/repos/asf/storm/blob/3d619678/external/storm-hdfs/README.md
----------------------------------------------------------------------
diff --git a/external/storm-hdfs/README.md b/external/storm-hdfs/README.md
index 10e62e1..f97ed51 100644
--- a/external/storm-hdfs/README.md
+++ b/external/storm-hdfs/README.md
@@ -554,7 +554,7 @@ Only methods mentioned in **bold** are required.
 | .setLockTimeoutSec()       |~~hdfsspout.lock.timeout.sec~~        |  5 minutes  | Duration of inactivity after which a lock file is considered to be abandoned and ready for another spout to take ownership |
 | .setClocksInSync()         |~~hdfsspout.clocks.insync~~           |    true     | Indicates whether clocks on the storm machines are in sync (using services like NTP). Used for detecting stale locks. |
 | .withConfigKey()           |                                      |             | Optional setting. Overrides the default key name ('hdfs.config', see below) used for specifying HDFS client configs. |
-| .setHdfsClientSettings()   |~~hdfs.config~~ (unless changed via withConfigKey)| | Set it to a Map of Key/value pairs indicating the HDFS settings to be used. For example, keytab and principle could be set using this. See section **Using keytabs on all worker hosts** under HDFS bolt below.|
+| .setHdfsClientSettings()   |~~hdfs.config~~ (unless changed via withConfigKey)| | Set it to a Map of Key/value pairs indicating the HDFS settings to be used. For example, keytab and principal could be set using this. See section **Using keytabs on all worker hosts** under HDFS bolt below.|
 | .withOutputStream()        |                                      |             | Name of output stream. If set, the tuples will be emited to the specified stream. Else tuples will be emited to the default output stream |
 
 ---


[2/2] storm git commit: Merge branch 'principal' of https://github.com/liu-zhaokun/storm

Posted by xi...@apache.org.
Merge branch 'principal' of https://github.com/liu-zhaokun/storm


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

Branch: refs/heads/master
Commit: 7f1566cfc37c5ea26022b4c66af73ddf5d1b0719
Parents: 2307b80 3d61967
Author: vesense <be...@163.com>
Authored: Wed Apr 19 09:38:57 2017 +0800
Committer: vesense <be...@163.com>
Committed: Wed Apr 19 09:38:57 2017 +0800

----------------------------------------------------------------------
 docs/storm-hbase.md            | 2 +-
 docs/storm-hdfs.md             | 2 +-
 external/storm-hbase/README.md | 2 +-
 external/storm-hdfs/README.md  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------