summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-03-12 17:11:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-03-12 17:11:59 +0100
commit32df7bf254f8e82f4857d9d0f5eeb49d678d08c8 (patch)
treee4de394adc42e7ac52669fa0467dc94506e36781 /ChangeLog
parent7d509d53df75bc2146bddebcbab14583474ac543 (diff)
parent0b5fe246b55635d8eaf3182ddad8961c7d3757c2 (diff)
downloadrsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.tar.gz
rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.tar.xz
rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.zip
Merge branch 'v6-stable'
Conflicts: runtime/queue.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5739c9d6..ce13e112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,8 @@ Version 6.2.1 [v6-stable], 2012-01-??
execute was configured
- bugfix: imklog invalidly computed facility and severity
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
---------------------------------------------------------------------------
Version 6.2.0 [v6-stable], 2012-01-09
- bugfix (kind of): removed numerical part from pri-text
@@ -471,7 +473,11 @@ 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.8 [V5-stable] 2012-0?-??
+Version 5.8.9 [V5-stable] 2012-03-??
+- bugfix: stopped DA queue was never processed after a restart due to a
+ regression from statistics module
+---------------------------------------------------------------------------
+Version 5.8.8 [V5-stable] 2012-03-05
- bugfix: omprog made rsyslog abort on startup if not binary to
execute was configured
- bugfix: imklog invalidly computed facility and severity