You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/06/17 16:17:57 UTC

[1/2] storm git commit: STORM-3109: Fixed incorrect conversion from relative path to absolute path for STORM_LOCAL_DIR

Repository: storm
Updated Branches:
  refs/heads/master 15a9a3bac -> d3625b098


STORM-3109: Fixed incorrect conversion from relative path to absolute path for STORM_LOCAL_DIR


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

Branch: refs/heads/master
Commit: b03ee18dd13196265c3d68e59e76380ccc6b4bd8
Parents: 0cb6590
Author: Zhengdai Hu <zh...@oath.com>
Authored: Fri Jun 15 16:56:01 2018 -0500
Committer: Zhengdai Hu <zh...@oath.com>
Committed: Fri Jun 15 16:56:01 2018 -0500

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/command/KillWorkers.java | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/b03ee18d/storm-core/src/jvm/org/apache/storm/command/KillWorkers.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/command/KillWorkers.java b/storm-core/src/jvm/org/apache/storm/command/KillWorkers.java
index c417ace..b9afaa5 100644
--- a/storm-core/src/jvm/org/apache/storm/command/KillWorkers.java
+++ b/storm-core/src/jvm/org/apache/storm/command/KillWorkers.java
@@ -22,7 +22,6 @@ import org.apache.storm.utils.Utils;
 public class KillWorkers {
     public static void main(String[] args) throws Exception {
         Map<String, Object> conf = Utils.readStormConfig();
-        conf.put(Config.STORM_LOCAL_DIR, new File((String) conf.get(Config.STORM_LOCAL_DIR)).getCanonicalPath());
         try (Supervisor supervisor = new Supervisor(conf, null, new StandaloneSupervisor())) {
             supervisor.shutdownAllWorkers(null, null);
         }


[2/2] storm git commit: Merge branch 'STORM-3109' of https://github.com/zd-project/storm into asfgit-master

Posted by sr...@apache.org.
Merge branch 'STORM-3109' of https://github.com/zd-project/storm into asfgit-master


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

Branch: refs/heads/master
Commit: d3625b0980faab699e6e3b5ca7ac6d07d5c7c275
Parents: 15a9a3b b03ee18
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sun Jun 17 18:15:23 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Sun Jun 17 18:15:23 2018 +0200

----------------------------------------------------------------------
 storm-core/src/jvm/org/apache/storm/command/KillWorkers.java | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------