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/86ccee49 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/86ccee49 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/86ccee49 Branch: refs/heads/master Commit: 86ccee493768a3cccfa05e2ca30d962c87dd4e67 Parents: e1ce13f a9ef86d Author: P. Taylor Goetz <[email protected]> Authored: Mon Jun 6 14:47:38 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Mon Jun 6 14:47:38 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 4 ++ README.markdown | 1 + bin/storm.py | 22 ++++--- docs/Powered-By.md | 10 +++ .../starter/trident/TridentKafkaWordCount.java | 67 ++++++++++++++------ external/storm-kafka/pom.xml | 5 ++ .../src/jvm/org/apache/storm/utils/Utils.java | 10 ++- 7 files changed, 87 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
