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 2016/06/24 10:02:18 UTC

[1/3] storm git commit: STORM-1888: add description for shell command

Repository: storm
Updated Branches:
  refs/heads/master dcae610e4 -> 55809d6cc


STORM-1888: add description for shell command


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

Branch: refs/heads/master
Commit: dbec495fe689bd4ead55f5ebb25ebcbaaff9c1e8
Parents: 2c77a20
Author: Xin Wang <be...@163.com>
Authored: Wed Jun 8 13:36:25 2016 +0800
Committer: Xin Wang <be...@163.com>
Committed: Wed Jun 22 22:10:48 2016 +0800

----------------------------------------------------------------------
 bin/storm.py | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/dbec495f/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index c9667c7..5b3f392 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -485,6 +485,11 @@ def kill_workers(*args):
         extrajars=[USER_CONF_DIR, os.path.join(STORM_DIR, "bin")])
 
 def shell(resourcesdir, command, *args):
+    """Syntax: [storm shell resourcesdir command args]
+
+    Archives resources to jar and uploads jar to Nimbus, and executes following arguments on "local". Useful for non JVM languages.
+    eg: `storm shell resources/ python topology.py arg1 arg2`
+    """
     tmpjarpath = "stormshell" + str(random.randint(0, 10000000)) + ".jar"
     os.system("jar cf %s %s" % (tmpjarpath, resourcesdir))
     runnerargs = [tmpjarpath, command]


[2/3] storm git commit: Merge branch 'STORM-1888' of https://github.com/vesense/storm into STORM-1888

Posted by ka...@apache.org.
Merge branch 'STORM-1888' of https://github.com/vesense/storm into STORM-1888


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

Branch: refs/heads/master
Commit: 4200a79aedf4dc8ce93293b7d11a51d51e5d2f86
Parents: dcae610 dbec495
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jun 24 19:00:41 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jun 24 19:00:41 2016 +0900

----------------------------------------------------------------------
 bin/storm.py | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------



[3/3] storm git commit: add STORM-1888 to CHANGELOG

Posted by ka...@apache.org.
add STORM-1888 to CHANGELOG


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

Branch: refs/heads/master
Commit: 55809d6cc986efcc261c1159dafe3ae459200abc
Parents: 4200a79
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jun 24 19:01:09 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jun 24 19:01:09 2016 +0900

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


http://git-wip-us.apache.org/repos/asf/storm/blob/55809d6c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4366a2f..ab477b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -108,6 +108,7 @@
  * STORM-1769: Added a test to check local nimbus with notifier plugin
 
 ## 1.1.0 
+ * STORM-1888: add description for shell command
  * STORM-1902: add a simple & flexible FileNameFormat for storm-hdfs
  * STORM-1914: Storm Kafka Field Topic Selector
  * STORM-1925: Remove Nimbus thrift call from Nimbus itself