You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by zh...@apache.org on 2016/03/28 21:07:28 UTC
[8/8] storm git commit: Merge branch '1300' of
https://github.com/zhuoliu/storm into STORM-1300
Merge branch '1300' of https://github.com/zhuoliu/storm into STORM-1300
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/da7969ea
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/da7969ea
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/da7969ea
Branch: refs/heads/master
Commit: da7969ea946ca9baa633a59454cc9ab0de4542db
Parents: 89a349e 3c79096
Author: zhuol <zh...@yahoo-inc.com>
Authored: Mon Mar 28 14:06:31 2016 -0500
Committer: zhuol <zh...@yahoo-inc.com>
Committed: Mon Mar 28 14:06:31 2016 -0500
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/Config.java | 2 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 20 +-
.../scheduler/resource_aware_scheduler_test.clj | 738 -------------------
.../resource/TestResourceAwareScheduler.java | 680 ++++++++++++++++-
.../TestUtilsForResourceAwareScheduler.java | 43 +-
5 files changed, 732 insertions(+), 751 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/da7969ea/storm-core/src/jvm/org/apache/storm/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/da7969ea/storm-core/src/jvm/org/apache/storm/utils/ConfigUtils.java
----------------------------------------------------------------------