You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/12/18 22:32:20 UTC

[2/3] storm git commit: Merge branch 'STORM-2238-1.x' of https://github.com/arunmahadevan/storm into STORM-2238-1.x-merge

Merge branch 'STORM-2238-1.x' of https://github.com/arunmahadevan/storm into STORM-2238-1.x-merge


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7bf95d66
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7bf95d66
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7bf95d66

Branch: refs/heads/1.x-branch
Commit: 7bf95d6644b294bd456e08386fe59ed1c78e0c5e
Parents: 3c6abc8 032592a
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Dec 19 07:28:13 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Dec 19 07:28:13 2016 +0900

----------------------------------------------------------------------
 docs/Windowing.md                               | 16 ++++++-
 .../clj/org/apache/storm/daemon/executor.clj    |  1 -
 storm-core/src/jvm/org/apache/storm/Config.java | 14 ++----
 .../apache/storm/topology/IWindowedBolt.java    | 11 +++++
 .../topology/TupleFieldTimestampExtractor.java  | 48 ++++++++++++++++++++
 .../storm/topology/WindowedBoltExecutor.java    | 12 +++--
 .../topology/base/BaseStatefulWindowedBolt.java | 10 ++++
 .../storm/topology/base/BaseWindowedBolt.java   | 22 ++++++++-
 .../storm/windowing/TimestampExtractor.java     | 35 ++++++++++++++
 .../topology/WindowedBoltExecutorTest.java      | 11 +++--
 10 files changed, 156 insertions(+), 24 deletions(-)
----------------------------------------------------------------------