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 2018/05/22 10:03:51 UTC
[2/2] storm git commit: Merge branch 'agresch_storm3042' of
https://github.com/agresch/storm into STORM-3042-merge
Merge branch 'agresch_storm3042' of https://github.com/agresch/storm into STORM-3042-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e6ad8938
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e6ad8938
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e6ad8938
Branch: refs/heads/master
Commit: e6ad8938e075612b07e7d0e054f8771e2c9359fb
Parents: 109c215 4f110e3
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue May 22 19:03:40 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue May 22 19:03:40 2018 +0900
----------------------------------------------------------------------
.../org/apache/storm/daemon/nimbus/Nimbus.java | 20 ++++----
.../apache/storm/scheduler/TopologyDetails.java | 51 ++++--------------
.../storm/scheduler/resource/RAS_Node.java | 8 ++-
.../storm/scheduler/resource/ResourceUtils.java | 10 ++--
.../normalization/NormalizedResourceOffer.java | 13 +++--
.../NormalizedResourceRequest.java | 43 ++++++++++++++--
.../normalization/NormalizedResources.java | 32 +++++-------
.../NormalizedResourceOfferTest.java | 50 ++++++++++++++++++
.../NormalizedResourceRequestTest.java | 54 ++++++++++++++++++++
.../normalization/NormalizedResourcesTest.java | 13 ++---
10 files changed, 203 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e6ad8938/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------