summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-03-17 18:35:07 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-03-17 18:35:07 +0100
commit5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36 (patch)
tree53ae95fd0f749a3db5b27342e65e07fc03a2e037 /ChangeLog
parentd94ba2a5468089b657e0779ddd2f4585face37e3 (diff)
parent59c99b2d8b23f8903e2130b7a149981afe1a8bd3 (diff)
downloadrsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.tar.gz
rsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.tar.xz
rsyslog-5cf53628ac8ec8f07ee1c4d7f4bd0faeac43ab36.zip
Merge branch 'v5-stable' into v6-stable
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f9fd3ce..ec31c170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Version 6.2.1 [v6-stable], 2012-01-??
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
- bugfix: stopped DA queue was never processed after a restart due to a
regression from statistics module
+- bugfix: memory leak in array passing output module mode
---------------------------------------------------------------------------
Version 6.2.0 [v6-stable], 2012-01-09
- bugfix (kind of): removed numerical part from pri-text
@@ -261,7 +262,12 @@ 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.9 [V5-stable] 2012-03-??
+Version 5.8.10 [V5-stable] 2012-??-??
+- bugfix: memory leak in array passing output module mode
+---------------------------------------------------------------------------
+Version 5.8.9 [V5-stable] 2012-03-15
+- added tool to recover disk queue if .qi file is missing (recover_qi.pl)
+ Thanks to Kaiwang Chen for contributing this tool
- bugfix: stopped DA queue was never processed after a restart due to a
regression from statistics module
- added better doc for statsobj interface