diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:19:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-21 10:19:56 +0200 |
| commit | bd7542b51593739893922e8ec8fb6d7195d06cbe (patch) | |
| tree | f7d0a85f593c2b71876365788535bd1b83c73dae /tests/testsuites/parse1.conf | |
| parent | 51aa94ea2c2ae57a6c7207aecf39dd4b578ad8f0 (diff) | |
| parent | 675d46f5b59f64e378968baa5e0dec6810090287 (diff) | |
| download | rsyslog-ac32b9c30855fe601dab50cffe1a929e79f02013.tar.gz rsyslog-ac32b9c30855fe601dab50cffe1a929e79f02013.tar.xz rsyslog-ac32b9c30855fe601dab50cffe1a929e79f02013.zip | |
Merge branch 'v4.3.2' (v4-beta) into v4-stablev4.4.0
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/Makefile.am
Diffstat (limited to 'tests/testsuites/parse1.conf')
| -rw-r--r-- | tests/testsuites/parse1.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/testsuites/parse1.conf b/tests/testsuites/parse1.conf index 0fb7d16d..947a05a8 100644 --- a/tests/testsuites/parse1.conf +++ b/tests/testsuites/parse1.conf @@ -1,6 +1,5 @@ $ModLoad ../plugins/omstdout/.libs/omstdout -$ModLoad ../plugins/imudp/.libs/imudp -$UDPServerRun 12514 +$IncludeConfig nettest.input.conf # This picks the to be tested input from the test driver! $ErrorMessagesToStderr off |