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 21:47:26 UTC

[2/3] git commit: Merge branch 'feature/apache-curator' of github.com:thinker0/incubator-storm

Merge branch 'feature/apache-curator' of github.com:thinker0/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/115540e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/115540e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/115540e8

Branch: refs/heads/master
Commit: 115540e8696c8b95bd0a4622e160e343e87dea0d
Parents: 4ee9ea7 b1bb394
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue May 20 15:29:25 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue May 20 15:29:25 2014 -0400

----------------------------------------------------------------------
 external/storm-kafka/pom.xml                            | 12 ++++++------
 .../src/jvm/storm/kafka/DynamicBrokersReader.java       |  6 +++---
 external/storm-kafka/src/jvm/storm/kafka/ZkState.java   |  6 +++---
 .../src/test/storm/kafka/DynamicBrokersReaderTest.java  | 10 +++++-----
 .../src/test/storm/kafka/KafkaTestBroker.java           | 12 ++++++------
 .../src/test/storm/kafka/ZkCoordinatorTest.java         |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/115540e8/external/storm-kafka/src/jvm/storm/kafka/DynamicBrokersReader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/115540e8/external/storm-kafka/src/jvm/storm/kafka/ZkState.java
----------------------------------------------------------------------