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

[2/3] storm git commit: Merge branch '1.x-STORM-1766' of https://github.com/jerrypeng/storm into STORM-1766-1.x

Merge branch '1.x-STORM-1766' of https://github.com/jerrypeng/storm into STORM-1766-1.x


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

Branch: refs/heads/1.x-branch
Commit: 790308d204584dbb12ce2dfd49bb61f55ba1c6c2
Parents: 66f5f68 d50a243
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Aug 14 23:39:03 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Aug 14 23:39:03 2016 +0900

----------------------------------------------------------------------
 .../jvm/org/apache/storm/scheduler/Cluster.java |   7 +
 .../storm/scheduler/resource/RAS_Node.java      |  11 +-
 .../DefaultResourceAwareStrategy.java           | 228 +++++++++----
 .../resource/TestResourceAwareScheduler.java    | 114 +------
 .../TestUtilsForResourceAwareScheduler.java     |  24 +-
 .../TestDefaultResourceAwareStrategy.java       | 333 +++++++++++++++++++
 6 files changed, 541 insertions(+), 176 deletions(-)
----------------------------------------------------------------------