You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/02/15 21:38:15 UTC
[2/3] storm git commit: Merge branch 'STORM-2250' of
github.com:srdo/storm
Merge branch 'STORM-2250' of github.com:srdo/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b8e458f4
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b8e458f4
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b8e458f4
Branch: refs/heads/master
Commit: b8e458f4a0eb5c79e6099b52a7acf9268b7b655e
Parents: 560ff86 6e75016
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Feb 15 16:33:21 2017 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Feb 15 16:33:21 2017 -0500
----------------------------------------------------------------------
CHANGELOG.md | 2 +
LICENSE | 102 +++++-
docs/storm-kafka-client.md | 22 ++
external/storm-kafka-client/pom.xml | 9 +-
.../apache/storm/kafka/spout/KafkaSpout.java | 200 +++--------
.../kafka/spout/internal/OffsetManager.java | 157 +++++++++
.../storm/kafka/spout/internal/Timer.java | 7 +-
.../spout/ByTopicRecordTranslatorTest.java | 2 +-
.../spout/DefaultRecordTranslatorTest.java | 2 +-
.../storm/kafka/spout/KafkaSpoutConfigTest.java | 4 +-
.../kafka/spout/KafkaSpoutRebalanceTest.java | 82 ++---
.../kafka/spout/SingleTopicKafkaSpoutTest.java | 334 ++++++++++---------
.../test/KafkaSpoutTopologyMainNamedTopics.java | 6 +-
.../KafkaSpoutTopologyMainWildcardTopics.java | 2 +-
pom.xml | 1 -
.../apache/storm/blobstore/BlobStoreUtils.java | 11 +-
.../src/jvm/org/apache/storm/utils/Time.java | 146 +++++---
storm-core/src/ui/public/css/style.css | 7 +
storm-core/src/ui/public/flux.html | 157 +++++++++
storm-core/src/ui/public/images/bolt.png | Bin 0 -> 6019 bytes
storm-core/src/ui/public/images/flux.png | Bin 0 -> 5328 bytes
storm-core/src/ui/public/images/spout.png | Bin 0 -> 5255 bytes
storm-core/src/ui/public/index.html | 7 +-
storm-core/src/ui/public/js/cytoscape-dagre.js | 192 +++++++++++
storm-core/src/ui/public/js/cytoscape.min.js | 63 ++++
storm-core/src/ui/public/js/dagre.min.js | 6 +
storm-core/src/ui/public/js/esprima.min.js | 2 +
storm-core/src/ui/public/js/js-yaml.min.js | 3 +
28 files changed, 1122 insertions(+), 404 deletions(-)
----------------------------------------------------------------------