summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-21 14:37:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-21 14:37:43 +0200
commitc78f1ef53835f38efa013a91dd89e36c60bc0891 (patch)
tree589af2915a9c444cf5a95138b09cbe367a4eb816
parentc718cf1ac37b7959e715b04cccfa11370ab1bbb6 (diff)
downloadrsyslog-c78f1ef53835f38efa013a91dd89e36c60bc0891.tar.gz
rsyslog-c78f1ef53835f38efa013a91dd89e36c60bc0891.tar.xz
rsyslog-c78f1ef53835f38efa013a91dd89e36c60bc0891.zip
doc: add imported patch to ChangeLog
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 487d2438..492c27d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ Version 6.5.0 [devel] 2012-0?-??
- bugfix: omhdfs did no longer compile
- bugfix: SystemLogSocketAnnotate did not work correctly
Thanks to Miloslav Trmač for the patch
+- $SystemLogParseTrusted config file option
+ Thanks to Milan Bartos for the patch
---------------------------------------------------------------------------
Version 6.3.13 [BETA] 2012-07-??
- omelasticsearch: support for parameters parent & dynparent added