summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-16 11:01:41 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-16 11:01:41 +0200
commit803462104b4eb319c05ea0f6e30c0b04548a1ed0 (patch)
tree994e92fbcb18fa858ac712fd2219cfa57a9e51c7 /ChangeLog
parent1b9a4f303bd3e0cb899788e1a8908ea60e23eadd (diff)
parent33bf53cdab0689bd7f100aca5f09dd6b69da0e94 (diff)
downloadrsyslog-803462104b4eb319c05ea0f6e30c0b04548a1ed0.tar.gz
rsyslog-803462104b4eb319c05ea0f6e30c0b04548a1ed0.tar.xz
rsyslog-803462104b4eb319c05ea0f6e30c0b04548a1ed0.zip
Merge branch 'v5-stable' into v5-devel
Conflicts: ChangeLog configure.ac
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 55f6fbc5..501861fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,7 +80,9 @@ 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.5 [V5-stable] (al), 2011-??-??
+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)
---------------------------------------------------------------------------
Version 5.8.4 [V5-stable] (al), 2011-08-10