You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/09/23 00:23:43 UTC

[18/50] storm git commit: Merge branch 'configuration_map_generics' of https://github.com/ddebree/storm into STORM-1032

Merge branch 'configuration_map_generics' of https://github.com/ddebree/storm into STORM-1032


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

Branch: refs/heads/STORM-1040
Commit: e48e03c6fe65a0dc9e7a7f169fd3540af7f867fa
Parents: 87b9b3a f55f7a7
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Sep 19 09:05:34 2015 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Sep 19 09:05:34 2015 +0900

----------------------------------------------------------------------
 docs/documentation/Tutorial.md                    |  2 +-
 .../elasticsearch/trident/TridentEsTopology.java  |  2 +-
 .../trident/OpaqueTridentEventHubSpout.java       |  2 +-
 .../TransactionalTridentEventHubSpout.java        |  2 +-
 .../storm/hdfs/trident/FixedBatchSpout.java       |  2 +-
 .../storm/hive/trident/TridentHiveTopology.java   |  2 +-
 .../coordination/BatchSubtopologyBuilder.java     |  4 ++--
 .../storm/drpc/LinearDRPCTopologyBuilder.java     |  7 +++----
 .../storm/topology/BaseConfigurationDeclarer.java |  2 +-
 .../topology/ComponentConfigurationDeclarer.java  |  2 +-
 .../backtype/storm/topology/TopologyBuilder.java  |  2 +-
 .../TransactionalTopologyBuilder.java             | 10 +++++-----
 .../storm/trident/spout/BatchSpoutExecutor.java   |  2 +-
 .../src/jvm/storm/trident/spout/IBatchSpout.java  |  2 +-
 .../spout/IOpaquePartitionedTridentSpout.java     |  2 +-
 .../trident/spout/IPartitionedTridentSpout.java   |  2 +-
 .../jvm/storm/trident/spout/ITridentSpout.java    |  2 +-
 .../trident/spout/RichSpoutBatchExecutor.java     |  2 +-
 .../storm/trident/testing/FeederBatchSpout.java   |  2 +-
 .../testing/FeederCommitterBatchSpout.java        |  2 +-
 .../storm/trident/testing/FixedBatchSpout.java    |  2 +-
 .../trident/topology/TridentTopologyBuilder.java  | 18 +++++++++---------
 22 files changed, 37 insertions(+), 38 deletions(-)
----------------------------------------------------------------------