Merge branch '1.x-branch' of https://github.com/srdo/storm into STORM-1549-1.x
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/887ec814 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/887ec814 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/887ec814 Branch: refs/heads/1.x-branch Commit: 887ec814856b7b8e59146af8e3d80810f07fbe39 Parents: f0abfff e701a2a Author: Robert (Bobby) Evans <[email protected]> Authored: Wed Mar 16 09:13:26 2016 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Wed Mar 16 09:13:26 2016 -0500 ---------------------------------------------------------------------- storm-core/src/clj/org/apache/storm/clojure.clj | 3 ++ .../src/clj/org/apache/storm/daemon/acker.clj | 10 +++- .../src/clj/org/apache/storm/daemon/common.clj | 9 +++- .../clj/org/apache/storm/daemon/executor.clj | 10 ++++ .../storm/coordination/CoordinatedBolt.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 | 51 ++++++++++++++++++-- 11 files changed, 110 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
