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/2835e37a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2835e37a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2835e37a Branch: refs/heads/master Commit: 2835e37a665178d2b736be8fdb56c182e6a129ac Parents: eff8c93 bd4260e Author: P. Taylor Goetz <[email protected]> Authored: Thu Jun 9 15:07:16 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Thu Jun 9 15:07:16 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 1 + README.markdown | 2 +- docs/Metrics.md | 97 +++++++++++++++++++- docs/Windowing.md | 24 ++++- pom.xml | 9 ++ .../clj/org/apache/storm/daemon/executor.clj | 1 + storm-core/src/jvm/org/apache/storm/Config.java | 8 ++ .../storm/topology/WindowedBoltExecutor.java | 25 ++++- .../topology/base/BaseStatefulWindowedBolt.java | 8 ++ .../storm/topology/base/BaseWindowedBolt.java | 14 +++ .../topology/WindowedBoltExecutorTest.java | 87 +++++++++++++++++- 11 files changed, 266 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
