summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-09-20 10:08:24 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-09-20 10:08:24 +0200
commit760b23aac9718c77ab6f5c56dc06ad173690a92b (patch)
treebe465081896848eea8cadbb35c0eb602a71c7202 /ChangeLog
parent88154352094b2014bacaed2e5ee15c9b77ed19d5 (diff)
parent1e6469e92096f9f6c04cb80479ab049a9caa4fa2 (diff)
downloadrsyslog-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--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c385cd3d..c14ccb04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.