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 2017/04/05 02:06:14 UTC

[2/3] storm git commit: Merge branch 'STORM-2363-merge'

Merge branch 'STORM-2363-merge'


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

Branch: refs/heads/master
Commit: dba325aa72eab65f45078ef79a2a4a619e189ef8
Parents: b2b9ecf de47d1b
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Apr 5 11:04:47 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Apr 5 11:04:47 2017 +0900

----------------------------------------------------------------------
 conf/defaults.yaml                                  |  2 ++
 storm-core/src/jvm/org/apache/storm/Config.java     |  7 +++++++
 .../src/jvm/org/apache/storm/executor/Executor.java |  8 ++++----
 .../org/apache/storm/stats/BoltExecutorStats.java   | 16 ++++++++--------
 .../src/jvm/org/apache/storm/stats/CommonStats.java |  7 +++----
 .../org/apache/storm/stats/SpoutExecutorStats.java  | 10 +++++-----
 6 files changed, 29 insertions(+), 21 deletions(-)
----------------------------------------------------------------------