diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-10-08 10:52:10 (GMT) |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2015-10-08 10:52:10 (GMT) |
| commit | 37928b52a59f80183004cc36b646aec5f9546ff5 (patch) | |
| tree | 1d93f5906b99cfc78be4a1a7ee7c9bc0058d6af0 /tap/tests/skip/Makefile.am | |
| parent | 934fa89f46789f40834d276a87b939c5df2e6c4f (diff) | |
| parent | 5a9ca0590f847ef96421912bd2562292580a7d7c (diff) | |
| download | monitoring-plugins-37928b52a59f80183004cc36b646aec5f9546ff5.tar.gz | |
Merge branch 'maint'
* maint:
sslutils: Remove superfluous parenthesis for sslv3 function too
sslutils: remove superfluous parenthesis
check_snmp: modified tests
check_snmp.c: switched DEFAULT_TIMEOUT to DEFAULT_SOCKET_TIMEOUT (provided by utils.h), already used by help description, see issue #1318
install snmpd on travis tests
enable libtab on travis builds
add perl snmp to travis dependencies
NEWS: Mention check_ups performance data fix
Fix incorrect performance data thresholds
check_dhcp: Fix option parsing
Fixes segfaults when running via monitoring worker (off-by-one)
travis: fix http test host
sslutils: Check if OpenSSL supports SSLv3.
Conflicts:
NEWS
plugins/sslutils.c
Diffstat (limited to 'tap/tests/skip/Makefile.am')
0 files changed, 0 insertions, 0 deletions