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 2014/04/08 18:08:46 UTC

[1/3] git commit: STORM-273. Error while running storm topologies on Windows using "storm jar"

Repository: incubator-storm
Updated Branches:
  refs/heads/master 2c8d3c892 -> 38ea0ca63


STORM-273. Error while running storm topologies on Windows using "storm jar"


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

Branch: refs/heads/master
Commit: 0d3b833d86687857ec8cbfb1e01041ffc8120798
Parents: c621a6c
Author: Suresh Srinivas <su...@yahoo-inc.com>
Authored: Thu Apr 3 14:17:14 2014 -0700
Committer: Suresh Srinivas <su...@yahoo-inc.com>
Committed: Thu Apr 3 14:17:14 2014 -0700

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/util.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0d3b833d/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj
index 580e950..8bfacd3 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -759,7 +759,7 @@
 
 (defn zip-contains-dir? [zipfile target]
   (let [entries (->> zipfile (ZipFile.) .entries enumeration-seq (map (memfn getName)))]
-    (some? #(.startsWith % (str target file-path-separator)) entries)
+    (some? #(.startsWith % (str target "/")) entries)
     ))
 
 (defn url-encode [s]


[2/3] git commit: Merge branch 'master' of https://github.com/sureshms/incubator-storm

Posted by bo...@apache.org.
Merge branch 'master' of https://github.com/sureshms/incubator-storm

STORM-273: Error while running storm topologies on Windows using "storm jar"


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

Branch: refs/heads/master
Commit: c02885673920bb60044714d2af08890df550622a
Parents: 2c8d3c8 0d3b833
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue Apr 8 16:05:20 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue Apr 8 16:05:20 2014 +0000

----------------------------------------------------------------------
 storm-core/src/clj/backtype/storm/util.clj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[3/3] git commit: STORM-273 updated change log.

Posted by bo...@apache.org.
STORM-273 updated change log.


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

Branch: refs/heads/master
Commit: 38ea0ca63651dcf535c4ac0b5bf4e48246e5236f
Parents: c028856
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue Apr 8 16:08:06 2014 +0000
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue Apr 8 16:08:06 2014 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/38ea0ca6/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2f2d1..91fa43b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## 0.9.2-incubating (unreleased)
+ * STORM-273: Error while running storm topologies on Windows using "storm jar"
  * STROM-247: Replace links to github resources in storm script
  * STORM-263: Update Kryo version to 2.21+
  * STORM-187: Fix Netty error "java.lang.IllegalArgumentException: timeout value is negative"