SF.net SVN: nagiosplug:[2159] nagiosplug/trunk

Revision: 2159
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2159&view=rev
Author:   dermoth
Date:     2009-03-05 23:40:29 +0000 (Thu, 05 Mar 2009)

Log Message:
-----------
Merge branch 'master' of ssh://repo.or.cz/srv/git/nagiosplugins

From: Ton Voon <[email protected]>

Modified Paths:
--------------
    nagiosplug/trunk/NEWS
    nagiosplug/trunk/THANKS.in
    nagiosplug/trunk/plugins/check_snmp.c

Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS	2009-03-05 23:40:19 UTC (rev 2158)
+++ nagiosplug/trunk/NEWS	2009-03-05 23:40:29 UTC (rev 2159)
@@ -20,7 +20,7 @@
 	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
 	Fixed check_mrtg returning UNKNOWN instead of OK (bug #2378068)
 	Fixed check_http behaviour: all check are now performed as long as a valid response is returned (sf.net #1460312)
-	check_http --onredirect=sticky follows using the same IP address (sf.net #2550208).
+	check_http --onredirect=sticky follows using the same IP address (sf.net #2550208)
 	Fixed coredump from check_nt when invalid drive is specified (#2179754 - Olli Hauer)
 
 1.4.13 25th Sept 2008

Modified: nagiosplug/trunk/THANKS.in
===================================================================
--- nagiosplug/trunk/THANKS.in	2009-03-05 23:40:19 UTC (rev 2158)
+++ nagiosplug/trunk/THANKS.in	2009-03-05 23:40:29 UTC (rev 2159)
@@ -246,3 +246,4 @@
 Erik Welch
 Nik Soggia
 Olli Hauer
+Richard Edward Horner

Modified: nagiosplug/trunk/plugins/check_snmp.c
===================================================================
--- nagiosplug/trunk/plugins/check_snmp.c	2009-03-05 23:40:19 UTC (rev 2158)
+++ nagiosplug/trunk/plugins/check_snmp.c	2009-03-05 23:40:29 UTC (rev 2159)
@@ -1003,6 +1003,8 @@
   printf ("    %s\n", _("Separates output on multiple OID requests"));
 
 	printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+	printf (" %s\n", "-e, --retries=INTEGER");
+	printf ("    %s\n", _("Number of retries to be used in the requests"));
 
 	printf (_(UT_VERBOSE));
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H