Merge branch 'STORM-2971' of https://github.com/srdo/storm into asfgit-master


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

Branch: refs/heads/master
Commit: 21832ad4098e9795d94403d25ceb5649099c5f9a
Parents: e8e1a4e 288d97c
Author: Stig Rohde Døssing <s...@apache.org>
Authored: Fri Mar 2 12:45:37 2018 +0100
Committer: Stig Rohde Døssing <s...@apache.org>
Committed: Fri Mar 2 12:45:37 2018 +0100

----------------------------------------------------------------------
 flux/README.md                                  | 137 ++++++++-----------
 flux/flux-core/pom.xml                          |   2 +-
 .../java/org/apache/storm/flux/FluxBuilder.java |  27 ++--
 .../flux/test/OnlyValueRecordTranslator.java    |  37 +++++
 .../storm/flux/test/TridentTopologySource.java  |   1 -
 .../src/test/resources/configs/kafka_test.yaml  |  61 ++++-----
 flux/flux-examples/README.md                    |   2 +-
 flux/flux-examples/pom.xml                      |   6 +-
 .../examples/OnlyValueRecordTranslator.java     |  37 +++++
 .../src/main/resources/kafka_spout.yaml         |  71 ++++------
 10 files changed, 200 insertions(+), 181 deletions(-)
----------------------------------------------------------------------


Reply via email to