You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/11/25 20:57:50 UTC
[2/3] storm git commit: Merge branch 'STORM-1220' of
https://github.com/haohui/storm into STORM-1220
Merge branch 'STORM-1220' of https://github.com/haohui/storm into STORM-1220
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/352a2849
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/352a2849
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/352a2849
Branch: refs/heads/master
Commit: 352a28498648747b25ea07fad313d63e627c3f44
Parents: 20a864d 35f1da7
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Wed Nov 25 11:22:34 2015 -0800
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Wed Nov 25 11:22:34 2015 -0800
----------------------------------------------------------------------
.../src/jvm/storm/kafka/KafkaUtils.java | 8 ++--
.../src/jvm/storm/kafka/KeyValueScheme.java | 5 +--
.../kafka/KeyValueSchemeAsMultiScheme.java | 5 ++-
.../jvm/storm/kafka/MessageMetadataScheme.java | 6 ++-
.../MessageMetadataSchemeAsMultiScheme.java | 3 +-
.../jvm/storm/kafka/StringKeyValueScheme.java | 3 +-
.../kafka/StringMessageAndMetadataScheme.java | 7 ++--
.../storm/kafka/StringMultiSchemeWithTopic.java | 21 +++-------
.../src/jvm/storm/kafka/StringScheme.java | 20 ++++++----
.../storm/kafka/StringKeyValueSchemeTest.java | 17 ++++++---
.../src/test/storm/kafka/TestStringScheme.java | 40 ++++++++++++++++++++
.../jvm/backtype/storm/spout/MultiScheme.java | 3 +-
.../backtype/storm/spout/RawMultiScheme.java | 3 +-
.../src/jvm/backtype/storm/spout/RawScheme.java | 9 ++++-
.../src/jvm/backtype/storm/spout/Scheme.java | 3 +-
.../storm/spout/SchemeAsMultiScheme.java | 3 +-
16 files changed, 106 insertions(+), 50 deletions(-)
----------------------------------------------------------------------