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 2015/03/17 16:41:56 UTC
[06/11] storm git commit: Merge pull request #10 from apache/master
Merge pull request #10 from apache/master
Merge from apache/storm to caofangkun/apache-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cee1c052
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cee1c052
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cee1c052
Branch: refs/heads/master
Commit: cee1c0527279487b2b7b991a7d6b42ee173c13f4
Parents: 03b76d2 2666d99
Author: caofangkun <ca...@gmail.com>
Authored: Mon Mar 9 10:23:05 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Mon Mar 9 10:23:05 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 4 +
SECURITY.md | 1 +
bin/storm | 584 ++-----------------
bin/storm.py | 543 +++++++++++++++++
conf/storm-env.sh | 24 +
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 7 +-
.../test/storm/kafka/bolt/KafkaBoltTest.java | 2 +-
.../src/clj/backtype/storm/daemon/logviewer.clj | 5 +-
.../src/clj/backtype/storm/daemon/task.clj | 11 +-
9 files changed, 648 insertions(+), 533 deletions(-)
----------------------------------------------------------------------