You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2015/11/24 23:50:46 UTC
[5/5] storm git commit: Merge branch 'STORM-1217-merge'
Merge branch 'STORM-1217-merge'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5a71ea07
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5a71ea07
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5a71ea07
Branch: refs/heads/master
Commit: 5a71ea07c71dd15854a30f5ecb555b19f0a4e59b
Parents: fc3b877 e182624
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Tue Nov 24 16:50:15 2015 -0600
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Tue Nov 24 16:50:15 2015 -0600
----------------------------------------------------------------------
CHANGELOG.md | 1 +
.../src/jvm/storm/starter/ResourceAwareExampleTopology.java | 2 +-
.../backtype/storm/scheduler/resource/ResourceAwareScheduler.java | 2 +-
.../storm/scheduler/resource/strategies/ResourceAwareStrategy.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------