Merge branch 'STORM-2623' of https://github.com/knusbaum/incubator-storm into 
STORM-2623-merge


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8e04115e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8e04115e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8e04115e

Branch: refs/heads/master
Commit: 8e04115e962b78d9f7a2a3c343eeb532cc79452b
Parents: 5d601e8 f3a4001
Author: Jungtaek Lim <kabh...@gmail.com>
Authored: Thu Aug 10 07:48:57 2017 +0900
Committer: Jungtaek Lim <kabh...@gmail.com>
Committed: Thu Aug 10 07:48:57 2017 +0900

----------------------------------------------------------------------
 .../src/jvm/org/apache/storm/Config.java        |  7 ++++
 .../utils/DisallowedStrategyException.java      | 40 ++++++++++++++++++++
 .../org/apache/storm/utils/ReflectionUtils.java | 12 ++++++
 .../jvm/org/apache/storm/utils/UtilsTest.java   |  2 +-
 .../resource/ResourceAwareScheduler.java        | 10 ++++-
 .../resource/TestResourceAwareScheduler.java    | 40 ++++++++++++++++++++
 6 files changed, 109 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to