Merge branch 'STORM-513'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dcb4cfe3 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dcb4cfe3 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dcb4cfe3 Branch: refs/heads/master Commit: dcb4cfe39c2100abf287595458fcfd930dce21d2 Parents: c2fefbc a933336 Author: P. Taylor Goetz <ptgo...@gmail.com> Authored: Fri Nov 14 16:47:43 2014 -0500 Committer: P. Taylor Goetz <ptgo...@gmail.com> Committed: Fri Nov 14 16:47:43 2014 -0500 ---------------------------------------------------------------------- .../storm-starter/multilang/resources/storm.js | 20 +- .../storm-starter/multilang/resources/storm.py | 87 +++++--- .../storm-starter/multilang/resources/storm.rb | 90 +++++--- .../src/test/storm/kafka/KafkaUtilsTest.java | 1 + storm-core/src/dev/resources/storm.js | 6 + storm-core/src/dev/resources/storm.py | 29 ++- storm-core/src/dev/resources/storm.rb | 55 +++-- .../jvm/backtype/storm/spout/ShellSpout.java | 65 +++++- .../src/jvm/backtype/storm/task/ShellBolt.java | 211 +++++++++++++------ storm-core/src/multilang/py/storm.py | 29 ++- storm-core/src/multilang/rb/storm.rb | 55 +++-- 11 files changed, 455 insertions(+), 193 deletions(-) ----------------------------------------------------------------------