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 2019/03/15 18:45:58 UTC

[storm] 04/04: Merge branch 'agresch_STORM-3344' of https://github.com/agresch/storm into STORM-3344-merge

This is an automated email from the ASF dual-hosted git repository.

kabhwan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git

commit 77c4e2857175cb980f984bc1dbe19751d71f9f41
Merge: 18ead35 0da9f18
Author: Jungtaek Lim (HeartSaVioR) <ka...@gmail.com>
AuthorDate: Sat Mar 16 03:45:31 2019 +0900

    Merge branch 'agresch_STORM-3344' of https://github.com/agresch/storm into STORM-3344-merge

 .../scheduler/blacklist/BlacklistScheduler.java    | 14 +++---
 .../strategies/DefaultBlacklistStrategy.java       | 10 ++---
 .../blacklist/TestBlacklistScheduler.java          | 52 ++++++++++++++++++++--
 .../blacklist/TestUtilsForBlacklistScheduler.java  | 16 +++++++
 .../resource/TestResourceAwareScheduler.java       |  2 +-
 5 files changed, 79 insertions(+), 15 deletions(-)