Merge branch 'STORM-3223' of https://github.com/revans2/incubator-storm into STORM-3223
STORM-3223: Fix NPE on blacklisted rack This closes #2830 Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4605ae0a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4605ae0a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4605ae0a Branch: refs/heads/master Commit: 4605ae0a34858309171e726e1924b9a37695c977 Parents: 0f89cd8 6d58e63 Author: Robert Evans <[email protected]> Authored: Fri Sep 14 13:11:20 2018 -0500 Committer: Robert Evans <[email protected]> Committed: Fri Sep 14 13:11:20 2018 -0500 ---------------------------------------------------------------------- .../resource/strategies/scheduling/BaseResourceAwareStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
