Merge branch 'metrics_v2' of https://git-wip-us.apache.org/repos/asf/storm into metrics_v2
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/dd977e8d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/dd977e8d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/dd977e8d Branch: refs/heads/1.x-branch Commit: dd977e8d384c49a7b38cdf30d1ce9b7f09055dcd Parents: a9647d8 00a382b Author: P. Taylor Goetz <[email protected]> Authored: Fri Dec 8 15:15:08 2017 -0500 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Dec 8 15:15:08 2017 -0500 ---------------------------------------------------------------------- .../clj/org/apache/storm/daemon/executor.clj | 22 ++++------ .../src/clj/org/apache/storm/daemon/task.clj | 8 ++-- storm-core/src/clj/org/apache/storm/stats.clj | 43 ++++++++++++-------- 3 files changed, 39 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
