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:20 UTC
[06/19] storm git commit: Merge branch 'master' of
github.com:apache/storm
Merge branch 'master' of github.com:apache/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d63167cc
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d63167cc
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d63167cc
Branch: refs/heads/master
Commit: d63167cc4a13289ef46b5fa1650621c57b191d3b
Parents: 56f27e5 413c740
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Thu Mar 17 09:29:54 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Thu Mar 17 09:29:54 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 4 +
README.markdown | 4 +-
.../src/clj/org/apache/storm/clojure.clj | 3 +
.../clj/org/apache/storm/daemon/executor.clj | 11 +-
.../src/clj/org/apache/storm/daemon/nimbus.clj | 2 +-
.../clj/org/apache/storm/internal/clojure.clj | 3 +
.../apache/storm/scheduler/DefaultScheduler.clj | 80 ---------
.../apache/storm/scheduler/EvenScheduler.clj | 98 -----------
.../storm/scheduler/IsolationScheduler.clj | 4 +-
.../storm/coordination/CoordinatedBolt.java | 4 +
.../src/jvm/org/apache/storm/daemon/Acker.java | 18 +-
.../org/apache/storm/daemon/StormCommon.java | 4 +
.../storm/scheduler/DefaultScheduler.java | 111 ++++++++++++
.../apache/storm/scheduler/EvenScheduler.java | 168 +++++++++++++++++++
.../apache/storm/scheduler/TopologyDetails.java | 3 +-
.../org/apache/storm/task/IOutputCollector.java | 1 +
.../org/apache/storm/task/OutputCollector.java | 11 ++
.../storm/topology/BasicOutputCollector.java | 10 ++
.../storm/topology/IBasicOutputCollector.java | 2 +
.../trident/topology/TridentBoltExecutor.java | 4 +
.../src/jvm/org/apache/storm/utils/Utils.java | 21 ++-
.../org/apache/storm/integration_test.clj | 53 +++++-
.../clj/org/apache/storm/scheduler_test.clj | 34 ++--
23 files changed, 443 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d63167cc/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------