diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 10:47:31 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 10:47:31 +0200 |
commit | bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d (patch) | |
tree | b738285c841d66b7fbfccb94d136e06275c58553 /doc/rsconf1_maxopenfiles.html | |
parent | 43d9709847de6d286825ed8eb4db3ac702d8ab00 (diff) | |
parent | 599a493cac7b067d34cba549c60f2d5bea9333b8 (diff) | |
download | rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.tar.gz rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.tar.xz rsyslog-bb293ca32a1b9750d53e9d6fdcf21a9d6d7c697d.zip |
Merge branch 'v5-stable' into beta
Conflicts:
doc/rsyslog_recording_pri.html
Diffstat (limited to 'doc/rsconf1_maxopenfiles.html')
0 files changed, 0 insertions, 0 deletions