summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-19 18:30:42 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-19 18:30:42 +0100
commit115610df12fba6e3372e539656e4394e800936ea (patch)
treed48be2ac8361b47fd629b194ed339c59705ac992
parent98e5663055891ad786406584039d4ded4b2ccc46 (diff)
parent3ed275481f3fa3da7d9d6e1c113a696ab9280b74 (diff)
downloadrsyslog-115610df12fba6e3372e539656e4394e800936ea.tar.gz
rsyslog-115610df12fba6e3372e539656e4394e800936ea.tar.bz2
rsyslog-115610df12fba6e3372e539656e4394e800936ea.zip
Merge branch 'v7-stable' into v7-devel
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b857b5f1..7cddf587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -227,6 +227,7 @@ Version 7.5.0 [devel] 2013-06-11
Thanks to Axel Rau for the patch.
---------------------------------------------------------------------------
Version 7.4.7 [v7.4-stable] 2013-11-??
+- bugfix: legacy directive $ActionQueueWorkerThreads was not honored
- bugfix: segfault on startup when certain script constructs are used
e.g. "if not $msg ..."
- bugfix: imuxsock: UseSysTimeStamp config parameter did not work correctly