summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:14:23 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:14:23 +0200
commita8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3 (patch)
tree020ab62e213bb3c88f1a977cd1bb0b2af9e9bc18 /ChangeLog
parentf285420d1731555eb9eb6717fc9c875651ab7c91 (diff)
parenta3953fbee90045b96bd5ef44b64883a6bff57fee (diff)
downloadrsyslog-a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3.tar.gz
rsyslog-a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3.tar.xz
rsyslog-a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3.zip
Merge branch 'v4-stable' into v4-beta
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 60735183..7e958ce3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
---------------------------------------------------------------------------
+Version 4.7.5 [v4-beta] (al), 2011-??-??
+- bugfix: potential misadressing in property replacer
+---------------------------------------------------------------------------
Version 4.7.4 [v4-beta] (rgerhards), 2011-07-11
- added support for the ":omusrmsg:" syntax in configuring user messages
- added support for the ":omfile:" syntax in configuring user messages
@@ -75,6 +78,9 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14
(bugs require certain non-standard settings to appear)
Thanks to varmojfekoj for the patch [imported from 4.5.8]
---------------------------------------------------------------------------
+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
@@ -781,6 +787,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