summaryrefslogtreecommitdiffstats
path: root/tests/testsuites/asynwr_deadlock4.conf
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-07-05 15:14:36 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-07-05 15:14:36 +0200
commitd9a82205ff0b42a84875d45c809e8b7aded7eb2b (patch)
tree861b66fbde7b876413c00e449315e2fbd81b07a5 /tests/testsuites/asynwr_deadlock4.conf
parent149bab9cd1eb77c0708369d0a56903db90ab9d5f (diff)
parent9de526eccd85324f8cff4968ac6b17fa66648c2b (diff)
downloadrsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.gz
rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.tar.xz
rsyslog-d9a82205ff0b42a84875d45c809e8b7aded7eb2b.zip
Merge branch 'v4-stable' into tmp
Conflicts: ChangeLog Makefile.am tests/Makefile.am
Diffstat (limited to 'tests/testsuites/asynwr_deadlock4.conf')
0 files changed, 0 insertions, 0 deletions