[monitoring-plugins] Merge pull request #1374 from ...

GitHub <[email protected]> Sat, 19 Nov 2016 16:40:11 +0100 (CET)

Newsgroups	gmane.network.nagios.cvs
Message-ID	<20161119154011.B9EBA20083CA__48488.9802210548$1479570032$gmane$org@orwell.monitoring-plugins.org>

    Module: monitoring-plugins
    Branch: master
    Commit: 6026ff5c1899b7b2516f9fb21b8ffb4b73168722
    Author: Oliver Skibbe <[email protected]>
 Committer: GitHub <[email protected]>
      Date: Sat Nov 19 16:36:26 2016 +0100
       URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=6026ff5

Merge pull request #1374 from riskersen/check_http_perfdata_timeo

check_http: added timeout to perfdata as max val

Resolves #1350

---