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 2015/03/17 16:41:52 UTC
[02/11] storm git commit: Merge pull request #6 from apache/master
Merge pull request #6 from apache/master
Merge from apache/storm to caofangkun/apache-storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3af6d18e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3af6d18e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3af6d18e
Branch: refs/heads/master
Commit: 3af6d18ed2d3b5998d0f7a0e87a10ce220eb207d
Parents: d8c98cb 8036109
Author: caofangkun <ca...@gmail.com>
Authored: Tue Feb 10 10:07:16 2015 +0800
Committer: caofangkun <ca...@gmail.com>
Committed: Tue Feb 10 10:07:16 2015 +0800
----------------------------------------------------------------------
CHANGELOG.md | 4 +
README.markdown | 7 +-
dev-tools/github/__init__.py | 11 ++
dev-tools/jira-github-join.py | 4 +-
dev-tools/storm-merge.py | 31 +++++
docs/documentation/Common-patterns.md | 14 +-
docs/documentation/Concepts.md | 13 +-
docs/documentation/Multilang-protocol.md | 4 +-
.../storm/starter/SkewedRollingTopWords.java | 134 +++++++++++++++++++
.../storm/starter/bolt/RollingCountAggBolt.java | 78 +++++++++++
.../coordination/BatchSubtopologyBuilder.java | 11 ++
.../storm/drpc/LinearDRPCInputDeclarer.java | 5 +-
.../storm/drpc/LinearDRPCTopologyBuilder.java | 13 +-
.../storm/grouping/PartialKeyGrouping.java | 31 ++++-
.../backtype/storm/topology/InputDeclarer.java | 3 +
.../storm/topology/TopologyBuilder.java | 11 ++
.../TransactionalTopologyBuilder.java | 13 +-
.../topology/TridentTopologyBuilder.java | 13 +-
.../storm/grouping/PartialKeyGroupingTest.java | 26 +++-
19 files changed, 402 insertions(+), 24 deletions(-)
----------------------------------------------------------------------