diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:36:58 +0200 |
| commit | 8fbefa688fc18dd1936158318ec92a108303d2e8 (patch) | |
| tree | 5090afbc864526b9d381b365dfc6365c0ffe408d /ChangeLog | |
| parent | 44609ec259fdd321520111049ace194a0941a157 (diff) | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| download | rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.gz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.tar.xz rsyslog-8fbefa688fc18dd1936158318ec92a108303d2e8.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -1,4 +1,8 @@ --------------------------------------------------------------------------- +Version 6.1.11 [BETA] (rgerhards), 2011-06-?? +- added support for the ":omusrmsg:" syntax in configuring user messages +- systemd support: set stdout/stderr to null - thx to Lennart for the patch +--------------------------------------------------------------------------- Version 6.1.10 [BETA] (rgerhards), 2011-06-22 - bugfix: problems in failover action handling closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 @@ -206,6 +210,10 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- +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 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 @@ -1052,7 +1060,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] |