Public Git Hosting - monitoring-plugins.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 5f77fa7 0a3252d)

commit	e260efb25690b13002a0bf432507f66bdad90f02
author	Holger Weiss <holger@zedat.fu-berlin.de>
	Fri, 28 Feb 2014 12:22:34 +0000 (28 13:22 +0100)
committer	Holger Weiss <holger@zedat.fu-berlin.de>
	Fri, 28 Feb 2014 12:22:34 +0000 (28 13:22 +0100)
tree	6e3fa00ba0c82457b83cdfaca050b8f31199e602	tree \| snapshot (tar.gz zip)
parent	5f77fa7510afda19c832b2497f4799d9648c532e	commit \| diff
parent	0a3252d88d148a8cb21774cd3ae6a1cb1fbb004c	commit \| diff

Merge remote-tracking branch 'awiddersheim/fix_trusted_path'

* awiddersheim/fix_trusted_path:
Fix trusted path

Conflicts:
plugins-scripts/check_ntp.pl
plugins-scripts/subst.in

Closes #1212.

16 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_breeze.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_disk_smb.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_file_age.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_flexlm.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_ifoperstatus.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_ifstatus.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_ircd.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_log.sh	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_mailq.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_mssql.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_netdns.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_oracle.sh	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_rpc.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/check_wave.pl	diff1 \|	diff2 \|	blob \| history
plugins-scripts/subst.in	diff1 \|	diff2 \|	blob \| history

Monitoring Plugins