summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:09:08 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:09:08 +0200
commita3953fbee90045b96bd5ef44b64883a6bff57fee (patch)
treef89f77d1a51189c6e131b4a13a1d6faeb346b20f /ChangeLog
parent1234d7c8cd5d76862510cff315ea965c4f978e55 (diff)
parent3229fbeb1e1183141cbf2508334a52f6a082c40b (diff)
downloadrsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.tar.gz
rsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.tar.xz
rsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.zip
Merge branch 'v3-stable' into v4-stable
Conflicts: runtime/msg.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dc3cf03a..43c266ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
---------------------------------------------------------------------------
+Version 4.6.8 [v4-stable] (rgerhards), 2011-??-??
+- bugfix: potential misadressing in property replacer
+---------------------------------------------------------------------------
Version 4.6.7 [v4-stable] (rgerhards), 2011-07-11
- added support for the ":omusrmsg:" syntax in configuring user messages
- added support for the ":omfile:" syntax in configuring user messages
@@ -699,6 +702,7 @@ Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
offset
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
- improved some code based on clang static analyzer results
+- bugfix: potential misadressing in property replacer
---------------------------------------------------------------------------
Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24
- bugfix(important): problem in TLS handling could cause rsyslog to loop