Merge branch 'STORM-1874' of github.com:darionyaphet/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1d9c0bed Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1d9c0bed Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1d9c0bed Branch: refs/heads/master Commit: 1d9c0bedd9c6a5b47264845e2708a245137311a7 Parents: acbee1d d0162b7 Author: P. Taylor Goetz <[email protected]> Authored: Thu Jun 9 16:15:27 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Thu Jun 9 16:15:27 2016 -0400 ---------------------------------------------------------------------- .../src/jvm/org/apache/storm/kafka/DynamicBrokersReader.java | 2 +- .../jvm/org/apache/storm/kafka/DynamicPartitionConnections.java | 2 +- .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaSpout.java | 2 +- .../storm-kafka/src/jvm/org/apache/storm/kafka/KafkaUtils.java | 2 +- .../src/jvm/org/apache/storm/kafka/PartitionManager.java | 2 +- .../storm-kafka/src/jvm/org/apache/storm/kafka/ZkCoordinator.java | 2 +- external/storm-kafka/src/jvm/org/apache/storm/kafka/ZkState.java | 2 +- .../jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java | 2 +- .../src/jvm/org/apache/storm/kafka/trident/ZkBrokerReader.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
