You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by zh...@apache.org on 2016/02/26 00:14:02 UTC

[7/7] storm git commit: Merge branch '1574' of https://github.com/zhuoliu/storm into Storm-1574

Merge branch '1574' of https://github.com/zhuoliu/storm into Storm-1574


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

Branch: refs/heads/master
Commit: 8fa5aa537a806539a8542af40b8ed68921601afc
Parents: 838ae33 bc35766
Author: zhuol <zh...@yahoo-inc.com>
Authored: Thu Feb 25 17:12:44 2016 -0600
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Thu Feb 25 17:12:44 2016 -0600

----------------------------------------------------------------------
 .../src/clj/org/apache/storm/daemon/nimbus.clj  |  6 ++-
 .../src/clj/org/apache/storm/daemon/worker.clj  |  8 ++--
 .../storm/cluster/IStormClusterState.java       |  2 +
 .../storm/cluster/StormClusterStateImpl.java    |  8 +++-
 .../storm/utils/WorkerBackpressureCallback.java |  2 +-
 .../storm/utils/WorkerBackpressureThread.java   | 38 +++++++++++----
 .../utils/WorkerBackpressureThreadTest.java     | 50 ++++++++++++++++++++
 7 files changed, 99 insertions(+), 15 deletions(-)
----------------------------------------------------------------------