summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-09-04 15:17:23 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-09-04 15:17:23 +0200
commit6d8df125979065640598bc9126258dc8645f748d (patch)
treec625b87b1ad7586222e99410d784703aad7b8c95 /ChangeLog
parent1e9febaf28ffa1a6107cd0f5f2c0ac0ab2b16830 (diff)
parentd7cfdcf28c1239908619aadac6ef4fa43f1b93fd (diff)
downloadrsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.gz
rsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.xz
rsyslog-6d8df125979065640598bc9126258dc8645f748d.zip
Merge branch 'v3-stable' into v4-stable
Conflicts: doc/rsyslog_conf.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 27dc26b3..0c127d1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -242,6 +242,8 @@ version before switching to this one.
---------------------------------------------------------------------------
Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
- bugfix: sending syslog messages with zip compression did not work
+- clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
+ in doc set (require TLS drivers)
---------------------------------------------------------------------------
Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02
- bugfix: invalid error message issued if $inlcudeConfig was on an empty