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/05/22 21:54:55 UTC
[10/18] storm git commit: Merge pull request #19 from apache/master
Merge pull request #19 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/bb8583ac
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bb8583ac
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bb8583ac
Branch: refs/heads/master
Commit: bb8583aca92fc563e0bd750d2783be59ff507173
Parents: a3602f2 84e8bc6
Author: caofangkun <ca...@gmail.com>
Authored: Tue Apr 21 14:27:13 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Apr 21 14:27:13 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 6 ++++
LICENSE | 29 ++++++++++++++++++++
external/storm-kafka/README.md | 21 +++++++++++++-
.../src/jvm/storm/kafka/KafkaConfig.java | 2 +-
.../src/jvm/storm/kafka/KafkaUtils.java | 5 +---
.../src/jvm/storm/kafka/PartitionManager.java | 4 +--
.../src/jvm/storm/kafka/bolt/KafkaBolt.java | 1 +
.../kafka/trident/TridentKafkaEmitter.java | 4 +--
.../src/test/storm/kafka/KafkaUtilsTest.java | 6 ++--
.../test/storm/kafka/bolt/KafkaBoltTest.java | 27 ++++++++++++++++++
.../src/clj/backtype/storm/daemon/executor.clj | 6 +++-
storm-core/src/clj/backtype/storm/ui/core.clj | 2 +-
.../src/ui/public/css/jsonFormatter.min.css | 1 +
storm-core/src/ui/public/css/style.css | 11 ++++++++
storm-core/src/ui/public/index.html | 3 ++
.../src/ui/public/js/jsonFormatter.min.js | 2 ++
storm-core/src/ui/public/js/script.js | 2 +-
storm-core/src/ui/public/topology.html | 3 ++
.../clj/backtype/storm/transactional_test.clj | 6 +++-
19 files changed, 124 insertions(+), 17 deletions(-)
----------------------------------------------------------------------