storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [02/10] storm git commit: Merge branch 'master' into Event-0216
Date Fri, 19 Feb 2016 14:54:38 GMT
Merge branch 'master' into Event-0216


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

Branch: refs/heads/master
Commit: a261c3ad942dca7edf4422b8d157639584fd1f22
Parents: 4e68904 4699990
Author: xiaojian.fxj <xiaojian.fxj@alibaba-inc.com>
Authored: Wed Feb 17 10:53:00 2016 +0800
Committer: xiaojian.fxj <xiaojian.fxj@alibaba-inc.com>
Committed: Wed Feb 17 10:53:00 2016 +0800

----------------------------------------------------------------------
 CHANGELOG.md                                    |   8 +
 bin/storm-config.cmd                            |   4 +
 bin/storm.cmd                                   |  22 +-
 bin/storm.py                                    |   8 +-
 .../spout/RandomNumberGeneratorSpout.java       |  95 +++++
 .../trident/TridentMinMaxOfDevicesTopology.java | 201 +++++++++++
 .../TridentMinMaxOfVehiclesTopology.java        | 180 ++++++++++
 pom.xml                                         |   6 +
 storm-core/pom.xml                              |   9 +
 .../clj/org/apache/storm/command/activate.clj   |  24 --
 .../clj/org/apache/storm/command/deactivate.clj |  24 --
 .../org/apache/storm/command/kill_topology.clj  |  29 --
 .../src/clj/org/apache/storm/command/list.clj   |  38 --
 .../clj/org/apache/storm/daemon/executor.clj    |  68 ++--
 .../src/clj/org/apache/storm/daemon/worker.clj  |  54 +--
 .../src/clj/org/apache/storm/disruptor.clj      |  89 -----
 .../jvm/org/apache/storm/command/Activate.java  |  40 +++
 .../src/jvm/org/apache/storm/command/CLI.java   | 353 +++++++++++++++++++
 .../org/apache/storm/command/Deactivate.java    |  40 +++
 .../org/apache/storm/command/KillTopology.java  |  51 +++
 .../src/jvm/org/apache/storm/command/List.java  |  50 +++
 .../jvm/org/apache/storm/trident/Stream.java    | 121 ++++++-
 .../operation/builtin/ComparisonAggregator.java |  91 +++++
 .../storm/trident/operation/builtin/Max.java    |  37 ++
 .../operation/builtin/MaxWithComparator.java    |  51 +++
 .../storm/trident/operation/builtin/Min.java    |  36 ++
 .../operation/builtin/MinWithComparator.java    |  51 +++
 .../org/apache/storm/utils/DisruptorQueue.java  |  15 +-
 .../org/apache/storm/utils/NimbusClient.java    |  19 +-
 .../src/jvm/org/apache/storm/utils/Utils.java   |  20 +-
 .../jvm/org/apache/storm/command/TestCLI.java   |  59 ++++
 31 files changed, 1593 insertions(+), 300 deletions(-)
----------------------------------------------------------------------



Mime
View raw message