diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:07:04 +0200 |
| commit | 68a01594000b788e530ee8f716545dafccf85982 (patch) | |
| tree | c5b54c9add730528f99c816db4faa55dfcfdbd1a /ChangeLog | |
| parent | e8e881e9795e5dc9fc14fd7f34523bcd6ae13106 (diff) | |
| parent | f09ee69ee1b7f8c098d0720c8e85a6753cc7d342 (diff) | |
| download | rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.gz rsyslog-68a01594000b788e530ee8f716545dafccf85982.tar.xz rsyslog-68a01594000b788e530ee8f716545dafccf85982.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,6 +1,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 --------------------------------------------------------------------------- Version 5.8.2 [V5-stable] (rgerhards), 2011-06-21 - bugfix: problems in failover action handling @@ -847,7 +848,10 @@ 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.6 [v4-stable] (rgerhards), 2010-11-?? +Version 4.6.7 [v4-stable] (rgerhards), 2011-06-?? +- added support for the ":omusrmsg:" syntax in configuring user messages +--------------------------------------------------------------------------- +Version 4.6.6 [v4-stable] (rgerhards), 2011-06-24 - bugfix: memory leak in imtcp & subsystems under some circumstances This leak is tied to error conditions which lead to incorrect cleanup of some data structures. [backport from v6, limited testing under v4] |