summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-29 16:37:39 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-29 16:37:39 +0100
commit16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f (patch)
tree80d398b7fa0ddf2781b98c97a29db503862ee487
parent2b3370b71bb909010fd55fd415c93944e2bb9546 (diff)
parent73e7088748e560cd0c6d1ed7264951d32f64d060 (diff)
downloadrsyslog-16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f.tar.gz
rsyslog-16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f.tar.bz2
rsyslog-16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f.zip
Merge branch 'v7-stable'
Conflicts: ChangeLog configure.ac doc/manual.html
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d46ee682..50931420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -193,7 +193,7 @@ Version 7.5.0 [devel] 2013-06-11
connections
Thanks to Axel Rau for the patch.
---------------------------------------------------------------------------
-Version 7.4.6 [v7.4-stable] 2013-11-??
+Version 7.4.6 [v7.4-stable] 2013-10-31
- bugfix: potential abort during HUP
This could happen when one of imklog, imzmq3, imkmsg, impstats,
imjournal, or imuxsock were under heavy load during a HUP.