Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b7432049 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b7432049 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b7432049 Branch: refs/heads/master Commit: b74320497ba3d3465ddc1c94eda0c4a387046b59 Parents: a09bf00 2a435b0 Author: P. Taylor Goetz <[email protected]> Authored: Fri Apr 1 00:56:04 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Apr 1 00:56:04 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 1 + 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 +- 6 files changed, 21 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/b7432049/CHANGELOG.md ----------------------------------------------------------------------
