[storm] branch master updated (17a5cbd -> 6dc8075)

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

agresch pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git.


    from 17a5cbd  Merge pull request #3184 from agresch/agresch_storm_3555
     new 3bedb34  STORM-3557 allow health checks to pass on timeout and add meter to track
     new 709001d  STORM-3557 use metrics registry as health check argument
     new ae0de85  Merge branch 'master' into agresch_storm_3557
     new 6dc8075  Merge pull request #3185 from agresch/agresch_storm_3557

The 10202 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/jvm/org/apache/storm/Constants.java        |  1 +
 .../jvm/org/apache/storm/command/HealthCheck.java  |  2 +-
 .../main/java/org/apache/storm/DaemonConfig.java   |  6 ++++++
 .../apache/storm/daemon/supervisor/Supervisor.java |  4 +++-
 .../supervisor/timer/SupervisorHealthCheck.java    |  2 +-
 .../apache/storm/healthcheck/HealthChecker.java    | 24 +++++++++++++++++++---
 6 files changed, 33 insertions(+), 6 deletions(-)