summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-29 12:54:49 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-29 12:54:49 +0200
commit8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024 (patch)
treebdea958d43cef054f2d9eed45f09957a0a44ec85 /ChangeLog
parentcb2a78b30bf55fd3d356cad7048b9e70968dbb95 (diff)
parent10430a189af0ecdbdad6c2542280f6d397ec4752 (diff)
downloadrsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.tar.gz
rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.tar.xz
rsyslog-8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024.zip
Merge branch 'beta' into master-module
Conflicts: ChangeLog configure.ac plugins/imklog/imklog.c plugins/imklog/imklog.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4361d3a..3ac89c65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,7 +14,11 @@ Version 6.5.0 [devel] 2012-0?-??
- added new 0mq plugins (via czmq lib)
Thanks to David Kelly for contributing these modules
---------------------------------------------------------------------------
-Version 6.3.11 [BETA] 2012-06-??
+Version 6.3.12 [BETA] 2012-06-18
+- bugfix: $ActionName was not properly honored
+ Thanks to Abby Edwards for alerting us
+---------------------------------------------------------------------------
+Version 6.3.11 [BETA] 2012-06-18
- bugfix: expression-based filters with AND/OR could segfault
due to a problem with boolean shortcut operations. From the user's
perspective, the segfault is almost non-deterministic (it occurs when