You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by lo...@apache.org on 2016/03/30 09:17:25 UTC
[11/19] storm git commit: Merge branch 'master' into pacemaker
Merge branch 'master' into pacemaker
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ca4507fc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ca4507fc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ca4507fc
Branch: refs/heads/master
Commit: ca4507fcfa0c54bbb7f2464c388cff24ee524aad
Parents: acd581d 2e2ffb2
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Fri Mar 18 21:17:32 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Fri Mar 18 21:17:32 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 2 +
.../clj/org/apache/storm/trident/testing.clj | 12 +-
.../ComponentConfigurationDeclarer.java | 5 +-
.../apache/storm/topology/ResourceDeclarer.java | 28 +++++
.../jvm/org/apache/storm/trident/Stream.java | 31 +++++-
.../org/apache/storm/trident/TridentState.java | 27 ++++-
.../apache/storm/trident/TridentTopology.java | 91 ++++++++++++++-
.../org/apache/storm/trident/graph/Group.java | 22 +++-
.../operation/DefaultResourceDeclarer.java | 66 +++++++++++
.../trident/operation/ITridentResource.java | 32 ++++++
.../org/apache/storm/trident/planner/Node.java | 5 +-
.../apache/storm/trident/integration_test.clj | 110 ++++++++++++++++---
12 files changed, 392 insertions(+), 39 deletions(-)
----------------------------------------------------------------------