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 2017/11/20 14:30:28 UTC

[4/4] storm git commit: Merge branch 'STORM-2805' of https://github.com/revans2/incubator-storm into STORM-2805

Merge branch 'STORM-2805' of https://github.com/revans2/incubator-storm into STORM-2805

STORM-2805: Clean up confs in TopologyBuilders

This closes #2419


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

Branch: refs/heads/master
Commit: 9d52435c5b5378bc4a618731ef5ecf573f07294a
Parents: 8e4a146 14cf5e6
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Nov 20 08:12:35 2017 -0600
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Nov 20 08:12:35 2017 -0600

----------------------------------------------------------------------
 storm-client/pom.xml                            |   2 +-
 .../coordination/BatchSubtopologyBuilder.java   |  70 +++++----
 .../storm/drpc/LinearDRPCTopologyBuilder.java   |  66 ++++-----
 .../topology/BaseConfigurationDeclarer.java     |   9 --
 .../ComponentConfigurationDeclarer.java         |   7 -
 .../apache/storm/topology/TopologyBuilder.java  |  59 ++++----
 .../TransactionalTopologyBuilder.java           | 118 +++++++--------
 .../topology/TridentTopologyBuilder.java        | 145 +++++++++----------
 storm-server/pom.xml                            |   2 +-
 .../apache/storm/scheduler/TopologyDetails.java |   7 +-
 .../storm/scheduler/resource/ResourceUtils.java |   8 +-
 .../TestGenericResourceAwareStrategy.java       | 112 ++++++++------
 12 files changed, 292 insertions(+), 313 deletions(-)
----------------------------------------------------------------------