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/05/20 20:58:39 UTC
[2/3] git commit: Merge branch 'master' of
github.com:brndnmtthws/incubator-storm
Merge branch 'master' of github.com:brndnmtthws/incubator-storm
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/512e34ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/512e34ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/512e34ee
Branch: refs/heads/master
Commit: 512e34eee399a57cffe9c38f68229d604c9f5db9
Parents: fe7ac29 5b02583
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue May 20 13:58:18 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue May 20 13:58:18 2014 -0400
----------------------------------------------------------------------
.../storm-kafka/src/jvm/storm/kafka/Broker.java | 3 +-
.../src/jvm/storm/kafka/BrokerHosts.java | 2 +-
.../jvm/storm/kafka/DynamicBrokersReader.java | 10 +-
.../src/jvm/storm/kafka/KafkaConfig.java | 2 +
.../src/jvm/storm/kafka/KafkaSpout.java | 21 +--
.../src/jvm/storm/kafka/KafkaUtils.java | 16 ++-
.../kafka/KeyValueSchemeAsMultiScheme.java | 1 +
.../jvm/storm/kafka/PartitionCoordinator.java | 2 +
.../src/jvm/storm/kafka/PartitionManager.java | 142 +++++++++++--------
.../src/jvm/storm/kafka/StaticCoordinator.java | 3 +
.../src/jvm/storm/kafka/StringScheme.java | 2 +-
.../src/jvm/storm/kafka/ZkCoordinator.java | 3 +-
.../src/jvm/storm/kafka/ZkHosts.java | 2 +-
.../src/jvm/storm/kafka/ZkState.java | 2 +-
.../trident/GlobalPartitionInformation.java | 3 +-
.../trident/TransactionalTridentKafkaSpout.java | 2 +-
.../kafka/trident/TridentKafkaEmitter.java | 1 -
.../jvm/storm/kafka/trident/ZkBrokerReader.java | 72 +++++-----
18 files changed, 172 insertions(+), 117 deletions(-)
----------------------------------------------------------------------