You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2017/08/30 21:07:59 UTC
[36/50] [abbrv] storm git commit: Merge branch 'STORM-2421' of
https://github.com/hmcc/storm into STORM-2421-1.x
Merge branch 'STORM-2421' of https://github.com/hmcc/storm into STORM-2421-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2562bdd6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2562bdd6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2562bdd6
Branch: refs/heads/metrics_v2
Commit: 2562bdd6656ef993cec402c73cf03a42e8e45bf4
Parents: 9b4c1e9 bd1c5ae
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sat Aug 19 15:29:25 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sat Aug 19 15:29:25 2017 +0900
----------------------------------------------------------------------
.../org/apache/storm/command/config_value.clj | 6 +-
storm-core/src/jvm/org/apache/storm/Config.java | 12 +-
.../jvm/org/apache/storm/scheduler/Cluster.java | 85 ++++++--------
.../apache/storm/scheduler/TopologyDetails.java | 2 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 31 +++++-
.../org/apache/storm/utils/ObjectReader.java | 58 ++++++++++
.../src/jvm/org/apache/storm/utils/Utils.java | 52 +++++----
.../test/jvm/org/apache/storm/ConfigTest.java | 92 +++++++++++++++
.../org/apache/storm/scheduler/ClusterTest.java | 111 +++++++++++++++++++
.../org/apache/storm/utils/ConfigUtilsTest.java | 98 ++++++++++++++++
.../jvm/org/apache/storm/utils/UtilsTest.java | 84 ++++++++++++++
11 files changed, 544 insertions(+), 87 deletions(-)
----------------------------------------------------------------------