summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@macbook.local>2009-03-05 23:39:31 (GMT)
committerTon Voon <tonvoon@macbook.local>2009-03-05 23:39:31 (GMT)
commit0e5a9df13507452637403c31e51c525dbed33f4d (patch)
treeb75c4b0559526af3afb868728591b3dd510177a6
parent8580335779b44f23a97b5534c90262b9658a37d7 (diff)
parent660dabd5ac7af2678c9e0f323195d1781447ec69 (diff)
downloadmonitoring-plugins-0e5a9df13507452637403c31e51c525dbed33f4d.tar.gz
Merge branch 'master' of ssh://repo.or.cz/srv/git/nagiosplugins
-rw-r--r--NEWS2
-rw-r--r--THANKS.in1
-rw-r--r--plugins/check_snmp.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 4dad53f..60ecb87 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ This file documents the major additions and syntax changes between releases.
20 Re-bundled libtap as a built-in library (--enable-libtap): detects system library as pre-1.4.13 and does not install the built-in library anymore 20 Re-bundled libtap as a built-in library (--enable-libtap): detects system library as pre-1.4.13 and does not install the built-in library anymore
21 Fixed check_mrtg returning UNKNOWN instead of OK (bug #2378068) 21 Fixed check_mrtg returning UNKNOWN instead of OK (bug #2378068)
22 Fixed check_http behaviour: all check are now performed as long as a valid response is returned (sf.net #1460312) 22 Fixed check_http behaviour: all check are now performed as long as a valid response is returned (sf.net #1460312)
23 check_http --onredirect=sticky follows using the same IP address (sf.net #2550208). 23 check_http --onredirect=sticky follows using the same IP address (sf.net #2550208)
24 Fixed coredump from check_nt when invalid drive is specified (#2179754 - Olli Hauer) 24 Fixed coredump from check_nt when invalid drive is specified (#2179754 - Olli Hauer)
25 25
261.4.13 25th Sept 2008 261.4.13 25th Sept 2008
diff --git a/THANKS.in b/THANKS.in
index 812bd37..36fd74f 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -246,3 +246,4 @@ Jan Lipphaus
246Erik Welch 246Erik Welch
247Nik Soggia 247Nik Soggia
248Olli Hauer 248Olli Hauer
249Richard Edward Horner
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 0982faf..a8e08fa 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1003,6 +1003,8 @@ print_help (void)
1003 printf (" %s\n", _("Separates output on multiple OID requests")); 1003 printf (" %s\n", _("Separates output on multiple OID requests"));
1004 1004
1005 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 1005 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
1006 printf (" %s\n", "-e, --retries=INTEGER");
1007 printf (" %s\n", _("Number of retries to be used in the requests"));
1006 1008
1007 printf (_(UT_VERBOSE)); 1009 printf (_(UT_VERBOSE));
1008 1010