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/08/14 14:23:47 UTC
[2/3] storm git commit: Merge branch '1.x-STORM-1913' of
https://github.com/knusbaum/incubator-storm into STORM-1913-1.x
Merge branch '1.x-STORM-1913' of https://github.com/knusbaum/incubator-storm into STORM-1913-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/00dfe7f8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/00dfe7f8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/00dfe7f8
Branch: refs/heads/1.x-branch
Commit: 00dfe7f859ee519f8ba95e4c50fc480b011c16fe
Parents: 8b1deb9 c5cf73b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Aug 14 23:20:47 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Aug 14 23:20:47 2016 +0900
----------------------------------------------------------------------
.../topology/BaseConfigurationDeclarer.java | 14 ++--
.../apache/storm/trident/TridentTopology.java | 82 ++++++++++++++------
.../org/apache/storm/trident/graph/Group.java | 74 ++++++++++++++----
.../operation/DefaultResourceDeclarer.java | 12 +--
.../org/apache/storm/trident/planner/Node.java | 9 ++-
.../storm/trident/planner/ProcessorNode.java | 5 ++
.../topology/TridentTopologyBuilder.java | 29 +++++--
.../apache/storm/trident/integration_test.clj | 3 +
8 files changed, 171 insertions(+), 57 deletions(-)
----------------------------------------------------------------------