diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:32:03 +0200 |
| commit | 8ea796903215ecaba737f9fbe89c0e052825535d (patch) | |
| tree | eed7b742e7d50d7bae6d5f7055342469ec82fdff /ChangeLog | |
| parent | 8162ff020d7c37ca1c9ec18e31e09e7f18df1cac (diff) | |
| parent | 68a01594000b788e530ee8f716545dafccf85982 (diff) | |
| download | rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.gz rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.tar.xz rsyslog-8ea796903215ecaba737f9fbe89c0e052825535d.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
doc/manual.html
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -1,4 +1,7 @@ --------------------------------------------------------------------------- +Version 5.9.2 [V5-DEVEL] (rgerhards), 2011-06-?? +- added support for the ":omusrmsg:" syntax in configuring user messages +--------------------------------------------------------------------------- Version 5.9.1 [V5-DEVEL] (rgerhards), 2011-06-30 - added support for obtaining timestamp for kernel message from message If the kernel time-stamps messages, time is now take from that @@ -66,6 +69,10 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 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 @@ -914,7 +921,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] |