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 2014/04/21 21:44:40 UTC

[41/50] [abbrv] git commit: Merge branch 'master' of /Users/tgoetz/Projects/apache/../other/storm-kafka-0.8-plus

Merge branch 'master' of /Users/tgoetz/Projects/apache/../other/storm-kafka-0.8-plus


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

Branch: refs/heads/master
Commit: 8fafbad96bce19a3f11add249d613f9009f9cf17
Parents: 84f04c3 adab172
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 9 09:33:50 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 9 09:33:50 2014 -0400

----------------------------------------------------------------------
 CHANGELOG.md                                    |   3 +
 README.md                                       |  10 +-
 src/jvm/storm/kafka/KafkaUtils.java             |  35 ++++-
 src/jvm/storm/kafka/PartitionManager.java       |  34 ++---
 src/jvm/storm/kafka/StaticCoordinator.java      |   7 +-
 src/jvm/storm/kafka/ZkCoordinator.java          |  35 +++--
 .../storm/kafka/DynamicBrokersReaderTest.java   |   2 +
 src/test/storm/kafka/KafkaTestBroker.java       |   1 +
 src/test/storm/kafka/KafkaUtilsTest.java        |  40 ++++++
 src/test/storm/kafka/TestUtils.java             |  20 +++
 src/test/storm/kafka/ZkCoordinatorTest.java     | 130 +++++++++++++++++++
 src/test/storm/kafka/bolt/KafkaBoltTest.java    |   1 +
 12 files changed, 270 insertions(+), 48 deletions(-)
----------------------------------------------------------------------