diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-24 16:28:49 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-24 16:28:49 +0200 |
commit | 808bf660cf74a42428567d869c29bab207e87e9f (patch) | |
tree | 02fb62abf81ec6664346304ed10d2d4753c96b90 | |
parent | 3a2a5442d93c8f994d8a274acb604c156a059e5e (diff) | |
parent | 79148e10312b12f3341aa68a5c9525cbe6e37a4d (diff) | |
download | rsyslog-808bf660cf74a42428567d869c29bab207e87e9f.tar.gz rsyslog-808bf660cf74a42428567d869c29bab207e87e9f.tar.bz2 rsyslog-808bf660cf74a42428567d869c29bab207e87e9f.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/msg.c
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -178,7 +178,11 @@ Version 7.5.0 [devel] 2013-06-11 connections Thanks to Axel Rau for the patch. --------------------------------------------------------------------------- -Version 7.4.5 [v7.4-stable] 2013-09-?? +Version 7.4.6 [v7.4-stable] 2013-11-?? +- bugfix: segfault if variable was assigned to non-container subtree + Thanks to Pavel Levshin for the fix +--------------------------------------------------------------------------- +Version 7.4.5 [v7.4-stable] 2013-10-22 - mmanon: removed the check for specific "terminator characters" after last octet. As it turned out, this didn't work in practice as there was an enormous set of potential terminator chars -- so removing |