Merge branch 'STORM-1668-1.x' of https://github.com/priyank5485/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f2809b4d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f2809b4d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f2809b4d Branch: refs/heads/1.x-branch Commit: f2809b4d47489f4ebef08d3b00948dac11c60def Parents: fe50a1b be09c3c Author: Kyle Nusbaum <[email protected]> Authored: Thu Mar 31 21:49:48 2016 -0500 Committer: Kyle Nusbaum <[email protected]> Committed: Thu Mar 31 21:49:48 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(-) ----------------------------------------------------------------------
