diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:24 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-20 10:08:24 +0200 |
commit | 760b23aac9718c77ab6f5c56dc06ad173690a92b (patch) | |
tree | be465081896848eea8cadbb35c0eb602a71c7202 /ChangeLog | |
parent | 88154352094b2014bacaed2e5ee15c9b77ed19d5 (diff) | |
parent | 1e6469e92096f9f6c04cb80479ab049a9caa4fa2 (diff) | |
download | rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.tar.gz rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.tar.xz rsyslog-760b23aac9718c77ab6f5c56dc06ad173690a92b.zip |
Merge branch 'v6-stable' into v6-devel
Conflicts:
ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -47,6 +47,11 @@ Version 6.5.0 [devel] 2012-08-28 Note: patches were released under ASL 2.0, see http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- +Version 6.4.3 [V6-STABLE] 2012-??-?? +- bugfix: sysklogd-emulating standard template was no longer present in v6 + This was obviously lost during the transition to the new config format. + Thanks to Milan Bartos for alerting us and a patch! +--------------------------------------------------------------------------- Version 6.4.2 [V6-STABLE] 2012-09-20 - bugfix: potential abort, if action queue could not be properly started This most importantly could happen due to configuration errors. |