diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 08:23:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 08:23:12 +0200 |
| commit | 24a81f99508821b608c1dc9e3fee6c2ebbaed59d (patch) | |
| tree | e69dcb9f836bb1f6a4489f428fb6a54f051781bf /ChangeLog | |
| parent | fdcaca6b85d65ef2c9b4814cc4a9adda4568e24f (diff) | |
| parent | d86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (diff) | |
| download | rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.tar.gz rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.tar.xz rsyslog-24a81f99508821b608c1dc9e3fee6c2ebbaed59d.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -11,6 +11,7 @@ Version 5.9.7 [V5-BETA], 2012-04-?? http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it. +- bugfix/tcpflood: sending small test files did not work correctly --------------------------------------------------------------------------- Version 5.9.6 [V5-BETA], 2012-04-12 - added configuration directives to customize queue light delay marks |