summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-22 17:15:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-22 17:15:43 +0200
commit2e6c5633a39357c84f769196e823004ee354f2fc (patch)
treedf5a3d253e2a6e2ef3558ea59be529e0910874c3
parentc8d66987a2aff47d5cd8d1dc811893ce91c8410d (diff)
parentd7f26ff418237415834f5c34d10de120e16dc721 (diff)
downloadrsyslog-2e6c5633a39357c84f769196e823004ee354f2fc.zip
rsyslog-2e6c5633a39357c84f769196e823004ee354f2fc.tar.gz
rsyslog-2e6c5633a39357c84f769196e823004ee354f2fc.tar.xz
Merge branch 'v5-stable' into v5-beta
Conflicts: ChangeLog configure.ac doc/manual.html
-rw-r--r--ChangeLog8
1 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 01b5503..fcb259b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 5.9.8 [V5-BETA], 2012-05-??
+Version 5.10.0 [V5-STABLE], 2012-05-??
- bugfix: delayble source could block action queue, even if there was
a disk queue associated with it. The root cause of this problem was
that it makes no sense to delay messages once they arrive in the
@@ -30,6 +30,10 @@ Version 5.9.8 [V5-BETA], 2012-05-??
Thanks to John N for reporting this issue.
- bugfix: "last message repeated n times" message was missing hostname
Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting
+- bugfix: multiple main queues with same queue file name was not detected
+ This lead to queue file corruption. While the root cause is a config
+ error, it is a bug that this important and hard to find config error
+ was not detected by rsyslog.
---------------------------------------------------------------------------
Version 5.9.7 [V5-BETA], 2012-05-10
- added capability to specify substrings for field extraction mode
@@ -177,7 +181,7 @@ 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.13 [V5-stable] 2012-06-??
+Version 5.8.13 [V5-stable] 2012-08-22
- bugfix: DA queue could cause abort
- bugfix: "last message repeated n times" message was missing hostname
Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting