You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2016/04/01 05:16:06 UTC

[2/3] storm git commit: Merge branch 'STORM-1668' of https://github.com/priyank5485/storm

Merge branch 'STORM-1668' of https://github.com/priyank5485/storm


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

Branch: refs/heads/master
Commit: 7a67fcb14564a8b1547bc66017d04adcc3525c20
Parents: 33e4994 436d775
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Thu Mar 31 22:13:50 2016 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Thu Mar 31 22:13:50 2016 -0500

----------------------------------------------------------------------
 docs/flux.md                                    |  6 ++--
 external/flux/README.md                         |  6 ++--
 .../java/org/apache/storm/flux/FluxBuilder.java | 29 ++++++++------------
 .../src/test/resources/configs/kafka_test.yaml  |  2 +-
 .../src/main/resources/kafka_spout.yaml         |  2 +-
 5 files changed, 20 insertions(+), 25 deletions(-)
----------------------------------------------------------------------