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/eff8c938 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/eff8c938 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/eff8c938 Branch: refs/heads/master Commit: eff8c9382f78aff15cfed11516991f7e503e9373 Parents: 86ccee4 2c77a20 Author: P. Taylor Goetz <[email protected]> Authored: Wed Jun 8 11:21:52 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Wed Jun 8 11:21:52 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 3 + README.markdown | 1 + bin/storm.py | 12 ++-- .../java/org/apache/storm/flux/FluxBuilder.java | 8 +++ external/flux/flux-examples/README.md | 18 ++++++ .../flux/examples/StatefulWordCounter.java | 64 ++++++++++++++++++++ .../resources/simple_stateful_wordcount.yaml | 60 ++++++++++++++++++ .../storm/hive/trident/TridentHiveTopology.java | 29 ++++++--- .../jvm/org/apache/storm/StormSubmitter.java | 48 +++++++++++---- .../storm/hooks/SubmitterHookException.java | 41 +++++++++++++ 10 files changed, 255 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
