diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-22 12:20:27 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-22 12:20:27 +0200 |
commit | 6d3cc9e406d3316300eaf537a1aa562e95499d70 (patch) | |
tree | 65bd1a0fcdf13cc324b2949b1ef9be22e8f6569f /tools/smtradfile.c | |
parent | d023d12bf9d3afa1957ad6bcb2c6e24dee2c22e9 (diff) | |
parent | 086db18cc304c9aff082e8ee4adfdadeacfa5c39 (diff) | |
download | rsyslog-6d3cc9e406d3316300eaf537a1aa562e95499d70.tar.gz rsyslog-6d3cc9e406d3316300eaf537a1aa562e95499d70.tar.xz rsyslog-6d3cc9e406d3316300eaf537a1aa562e95499d70.zip |
Merge branch 'v4-stable' into v5-stable
NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/parser.c
runtime/rsyslog.h
tests/Makefile.am
tests/tcpflood.c
Diffstat (limited to 'tools/smtradfile.c')
0 files changed, 0 insertions, 0 deletions