summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-18 15:41:22 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-18 15:41:22 +0200
commit53135efb4e793da3eb94d9e42c340484192aefcf (patch)
tree804f0b982ec849c8b0b128be8847e722ecfa5694 /ChangeLog
parent803462104b4eb319c05ea0f6e30c0b04548a1ed0 (diff)
parent154747929f87010b444af2d552f980daafe451e6 (diff)
downloadrsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.tar.gz
rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.tar.xz
rsyslog-53135efb4e793da3eb94d9e42c340484192aefcf.zip
Merge branch 'v5-stable' into v5-devel
Conflicts: configure.ac
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 501861fa..160ca370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -84,6 +84,9 @@ Version 5.8.5 [V5-stable] (rgerhards/al), 2011-??-??
- bugfix: potential hang condition during tag emulation
- bugfix: too-early string termination during tag emulation
- bugfix: The NUL-Byte for the syslogtag was not copied in MsgDup (msg.c)
+- bugfix: fixed incorrect state handling for Discard Action (transactions)
+ Note: This caused all messages in a batch to be set to COMMITTED,
+ even if they were discarded.
---------------------------------------------------------------------------
Version 5.8.4 [V5-stable] (al), 2011-08-10
- bugfix: potential misadressing in property replacer