diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-25 11:05:18 +0200 |
commit | fc0712f40ae63aa54080683c7ee5ae52055c009d (patch) | |
tree | b236e751acbe262a1f334221d523a2f121a3edff /tests/omod-if-array.sh | |
parent | e89ae2e7b18ba935d7eea4c44f3ec15ff6dcfb31 (diff) | |
parent | eb1615068c6a704287eda732d287280df4cc4c44 (diff) | |
download | rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.gz rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.tar.bz2 rsyslog-fc0712f40ae63aa54080683c7ee5ae52055c009d.zip |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
Diffstat (limited to 'tests/omod-if-array.sh')
-rwxr-xr-x | tests/omod-if-array.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/omod-if-array.sh b/tests/omod-if-array.sh index 7b4b5611..2c2a8ef3 100755 --- a/tests/omod-if-array.sh +++ b/tests/omod-if-array.sh @@ -1,5 +1,5 @@ echo test omod-if-array via udp -./killrsyslog.sh # kill rsyslogd if it runs for some reason +$srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason ./nettester -tomod-if-array -iudp -p4711 if [ "$?" -ne "0" ]; then |