You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2015/10/28 15:13:52 UTC

[13/14] storm git commit: Merge branch 'STORM-697' of https://github.com/mjtieman/storm into STORM-697

Merge branch 'STORM-697' of https://github.com/mjtieman/storm into STORM-697


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

Branch: refs/heads/master
Commit: 81f6355afed7f258605e8c137ffee332d36b2b71
Parents: 437c4b1 c0c830c
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Oct 28 23:10:33 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Oct 28 23:10:33 2015 +0900

----------------------------------------------------------------------
 external/storm-kafka/README.md                  | 44 ++++++++++-------
 .../src/jvm/storm/kafka/KafkaConfig.java        |  3 +-
 .../src/jvm/storm/kafka/KafkaUtils.java         |  8 +++
 .../jvm/storm/kafka/MessageMetadataScheme.java  | 25 ++++++++++
 .../MessageMetadataSchemeAsMultiScheme.java     | 40 +++++++++++++++
 .../src/jvm/storm/kafka/PartitionManager.java   | 13 ++++-
 .../kafka/StringMessageAndMetadataScheme.java   | 42 ++++++++++++++++
 .../kafka/trident/TridentKafkaEmitter.java      | 14 ++++--
 .../src/test/storm/kafka/KafkaUtilsTest.java    | 52 ++++++++++++++------
 9 files changed, 203 insertions(+), 38 deletions(-)
----------------------------------------------------------------------