summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-10 14:52:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-10 14:52:57 +0200
commit370bfa988db48ede39e74bcfae0d1909ecb0af66 (patch)
treef5dbcdd0549d6bd41380e6b995e8c037efa4b0b5
parent3d8f44648880b748199f9b33c4f9f84c7065199c (diff)
parent184497d4cbc438d14d1dedb0b21e8b6e27990690 (diff)
downloadrsyslog-370bfa988db48ede39e74bcfae0d1909ecb0af66.tar.gz
rsyslog-370bfa988db48ede39e74bcfae0d1909ecb0af66.tar.xz
rsyslog-370bfa988db48ede39e74bcfae0d1909ecb0af66.zip
Merge branch 'v5-stable' into v5-beta
Conflicts: ChangeLog
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f84804f..fe733c52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -153,6 +153,15 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08
affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
---------------------------------------------------------------------------
+Version 5.8.12 [V5-stable] 2012-05-??
+- bugfix: disk queue was not persisted on shutdown, regression of fix to
+ http://bugzilla.adiscon.com/show_bug.cgi?id=299
+ The new code also handles the case of shutdown of blocking light and
+ full delayable sources somewhat smarter and permits, assuming sufficient
+ timouts, to persist message up to the max queue capacity. Also some nits
+ in debug instrumentation have been fixed.
+- 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