diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 10:08:13 +0200 |
| commit | 398966be6d5a94d2602a08305b0533bf4a502a95 (patch) | |
| tree | 6d2a7458311963fb4393ecc8549e1ece2062a7e5 /ChangeLog | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
| download | rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.gz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.tar.xz rsyslog-398966be6d5a94d2602a08305b0533bf4a502a95.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/diag.sh
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -2,6 +2,7 @@ Version 5.8.3 [V5-stable] (rgerhards), 2011-06-?? - systemd support: set stdout/stderr to null - thx to Lennart for the patch - added support for the ":omusrmsg:" syntax in configuring user messages +- added support for the ":omfile:" syntax in configuring user messages --------------------------------------------------------------------------- Version 5.8.2 [V5-stable] (rgerhards), 2011-06-21 - bugfix: problems in failover action handling @@ -848,8 +849,9 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14 Thanks for varmojfekoj for pointing me at this bug. - imported changes from 4.5.6 and below --------------------------------------------------------------------------- -Version 4.6.7 [v4-stable] (rgerhards), 2011-06-?? +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 --------------------------------------------------------------------------- Version 4.6.6 [v4-stable] (rgerhards), 2011-06-24 - bugfix: memory leak in imtcp & subsystems under some circumstances |