summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-10 14:54:19 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-10 14:54:19 +0200
commit68f7a7bfd21a63c6b3f753341ac48a8873a260a7 (patch)
tree892717e2c79ab6c84691cbb6795d0953a602eb6d /ChangeLog
parent7f2b8c85dbce62f196002bc08108cc4182be481f (diff)
parent184497d4cbc438d14d1dedb0b21e8b6e27990690 (diff)
downloadrsyslog-68f7a7bfd21a63c6b3f753341ac48a8873a260a7.tar.gz
rsyslog-68f7a7bfd21a63c6b3f753341ac48a8873a260a7.tar.xz
rsyslog-68f7a7bfd21a63c6b3f753341ac48a8873a260a7.zip
Merge branch 'v5-stable' into v6-stable
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog14
1 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 21cddbaf..d1f05f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
---------------------------------------------------------------------------
+Version 6.2.2 [v6-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.
+---------------------------------------------------------------------------
Version 6.2.1 [v6-stable], 2012-05-10
- change plugin config interface to be compatible with pre-v6.2 system
The functionality was already removed (because it is superseeded by the
@@ -274,6 +282,12 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-??
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