diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:43:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-05-10 09:43:06 +0200 |
| commit | e577d6bc7968ede9ed0cb8693b95478daf0ffb08 (patch) | |
| tree | d2d35558840b174f42646fcb51d9cd897178b654 /ChangeLog | |
| parent | 4f70113457993c536fc948d5b3b3e69dc7a92a8a (diff) | |
| parent | d86a212255d9fd1ef3e4b0e99db1f4bfd0625260 (diff) | |
| download | rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.gz rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.tar.xz rsyslog-e577d6bc7968ede9ed0cb8693b95478daf0ffb08.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -25,6 +25,7 @@ Version 6.2.1 [v6-stable], 2012-01-?? 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 6.2.0 [v6-stable], 2012-01-09 - bugfix (kind of): removed numerical part from pri-text @@ -272,6 +273,9 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- +Version 5.8.12 [V5-stable] 2012-05-?? +- bugfix/tcpflood: sending small test files did not work correctly +--------------------------------------------------------------------------- Version 5.8.11 [V5-stable] 2012-05-03 - bugfix: ommysql did not properly init/exit the mysql runtime library this could lead to segfaults. Triggering condition: multiple action |