You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/04/14 09:03:31 UTC

[1/2] storm git commit: [STORM-2476] the path for 4 kinds of built-in schedulers in Storm-Scheduler.md is wrong

Repository: storm
Updated Branches:
  refs/heads/master aca117db7 -> 487a246cb


[STORM-2476] the path for 4 kinds of built-in schedulers in Storm-Scheduler.md is wrong


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

Branch: refs/heads/master
Commit: e43e86fe11a916d937867c5265d56d597d93923e
Parents: 4df35c5
Author: liuzhaokun <li...@zte.com.cn>
Authored: Fri Apr 14 16:12:32 2017 +0800
Committer: \u5218\u5146\u576410206665 <li...@zte.com.cn>
Committed: Fri Apr 14 16:12:32 2017 +0800

----------------------------------------------------------------------
 docs/Storm-Scheduler.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/e43e86fe/docs/Storm-Scheduler.md
----------------------------------------------------------------------
diff --git a/docs/Storm-Scheduler.md b/docs/Storm-Scheduler.md
index 7b8947e..4b9807e 100644
--- a/docs/Storm-Scheduler.md
+++ b/docs/Storm-Scheduler.md
@@ -4,7 +4,7 @@ layout: documentation
 documentation: true
 ---
 
-Storm now has 4 kinds of built-in schedulers: [DefaultScheduler]({{page.git-blob-base}}/storm-server/src/jvm/org/apache/storm/scheduler/DefaultScheduler.java), [IsolationScheduler]({{page.git-blob-base}}/storm-server/src/jvm/org/apache/storm/scheduler/IsolationScheduler.java), [MultitenantScheduler]({{page.git-blob-base}}/storm-server/src/jvm/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java), [ResourceAwareScheduler](Resource_Aware_Scheduler_overview.html). 
+Storm now has 4 kinds of built-in schedulers: [DefaultScheduler]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/scheduler/DefaultScheduler.java), [IsolationScheduler]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/scheduler/IsolationScheduler.java), [MultitenantScheduler]({{page.git-blob-base}}/storm-server/src/main/java/org/apache/storm/scheduler/multitenant/MultitenantScheduler.java), [ResourceAwareScheduler](Resource_Aware_Scheduler_overview.html). 
 
 ## Pluggable scheduler
 You can implement your own scheduler to replace the default scheduler to assign executors to workers. You configure the class to use the "storm.scheduler" config in your storm.yaml, and your scheduler must implement the [IScheduler]({{page.git-blob-base}}/storm-client/src/jvm/org/apache/storm/scheduler/IScheduler.java) interface.


[2/2] storm git commit: Merge branch 'kafkamdsecurity' of https://github.com/liu-zhaokun/storm into STORM-2476-merge

Posted by ka...@apache.org.
Merge branch 'kafkamdsecurity' of https://github.com/liu-zhaokun/storm into STORM-2476-merge


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

Branch: refs/heads/master
Commit: 487a246cb290cdba6f7549a52a6c88ca7ae147f8
Parents: aca117d e43e86f
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Apr 14 18:03:09 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Apr 14 18:03:09 2017 +0900

----------------------------------------------------------------------
 docs/Storm-Scheduler.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------