summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-24 16:29:07 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-24 16:29:07 +0200
commit62ce957a994a7a3e799fc5f196cc72ef4d00a089 (patch)
tree94500bc7d8c72786d03a8962e190602e54b89afe
parent8443e8c2d7c1f5d82d9bd678c634ba7d562e1f63 (diff)
parent808bf660cf74a42428567d869c29bab207e87e9f (diff)
downloadrsyslog-62ce957a994a7a3e799fc5f196cc72ef4d00a089.tar.gz
rsyslog-62ce957a994a7a3e799fc5f196cc72ef4d00a089.tar.bz2
rsyslog-62ce957a994a7a3e799fc5f196cc72ef4d00a089.zip
Merge branch 'master' into master-var-refactor
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e76f6666..1c3585e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -180,7 +180,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