summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-14 17:06:40 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-14 17:06:40 +0200
commitd30526568c77ceddedd47dd0c309c2224bb74ba0 (patch)
tree97cb544c815fc5f91846a9ef4fb0109513efccbc /ChangeLog
parente6b2cba8038061ab7f1f324110eeabbc8dfe2c30 (diff)
parent73cc2afb2246a0339fdadde4f2bf66120bcae20f (diff)
downloadrsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.tar.gz
rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.tar.xz
rsyslog-d30526568c77ceddedd47dd0c309c2224bb74ba0.zip
Merge branch 'v3-stable' into v4-beta
Conflicts: plugins/imrelp/imrelp.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d5bf1a28..3233000f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -401,6 +401,8 @@ version before switching to this one.
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
+- enhance: imrelp now also provides remote peer's IP address
+ [if librelp != 1.0.0 is used]
- bugfix: sending syslog messages with zip compression did not work
- clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
in doc set (require TLS drivers)