You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/16 15:36:58 UTC
[6/7] storm git commit: Merge branch 'master' of
https://github.com/srdo/storm into STORM-1549
Merge branch 'master' of https://github.com/srdo/storm into STORM-1549
STORM-1549: Add support for resetting tuple timeout from bolts via the OutputCollector
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ceeab062
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ceeab062
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ceeab062
Branch: refs/heads/master
Commit: ceeab062ef73ecdfa66c136ba655ce773fb2d9fc
Parents: 7f52aec e0b874f
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Wed Mar 16 08:50:38 2016 -0500
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Wed Mar 16 08:50:38 2016 -0500
----------------------------------------------------------------------
.../src/clj/org/apache/storm/clojure.clj | 3 ++
.../clj/org/apache/storm/daemon/executor.clj | 11 +++-
.../clj/org/apache/storm/internal/clojure.clj | 3 ++
.../storm/coordination/CoordinatedBolt.java | 4 ++
.../src/jvm/org/apache/storm/daemon/Acker.java | 18 ++++---
.../org/apache/storm/daemon/StormCommon.java | 4 ++
.../org/apache/storm/task/IOutputCollector.java | 1 +
.../org/apache/storm/task/OutputCollector.java | 11 ++++
.../storm/topology/BasicOutputCollector.java | 10 ++++
.../storm/topology/IBasicOutputCollector.java | 2 +
.../trident/topology/TridentBoltExecutor.java | 4 ++
.../org/apache/storm/integration_test.clj | 53 ++++++++++++++++++--
12 files changed, 114 insertions(+), 10 deletions(-)
----------------------------------------------------------------------