summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-27 13:52:27 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-27 13:52:27 +0100
commit1773bfa14b271d3bcd7fd96bba0bae8028280b75 (patch)
tree6d0d3eb60c9df2cc364ff612b8f13fab3a25e383 /ChangeLog
parent99a48039fba51cad2ee6a18a756079fbccab32a2 (diff)
parent2a813afa41cfda63896002b037742a67678584ad (diff)
downloadrsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.tar.gz
rsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.tar.xz
rsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.zip
Merge branch 'v6-stable'
Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c9ddd5b6..9cbe3841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@ Version 6.2.1 [v6-stable], 2012-01-??
order to limit potential regressions. However, it was considered useful
enough to do the interface change in v6-stable; this also eases merging
branches!
+- re-licensed larger parts of the codebase under the Apache license 2.0
+- bugfix: omprog made rsyslog abort on startup if not binary to
+ execute was configured
---------------------------------------------------------------------------
Version 6.2.0 [v6-stable], 2012-01-09
- bugfix (kind of): removed numerical part from pri-text
@@ -460,6 +463,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.8 [V5-stable] 2012-0?-??
+- bugfix: omprog made rsyslog abort on startup if not binary to
+ execute was configured
+---------------------------------------------------------------------------
Version 5.8.7 [V5-stable] 2012-01-17
- bugfix: instabilities when using RFC5424 header fields
Thanks to Kaiwang Chen for the patch
@@ -1317,6 +1324,11 @@ increase.
output module interface
---------------------------------------------------------------------------
Version 4.8.1 [v4-stable], 2011-09-??
+- increased max config file line size to 64k
+ We now also emit an error message if even 64k is not enough (not
+ doing so previously may rightfully be considered as a bug)
+- bugfix: omprog made rsyslog abort on startup if not binary to
+ execute was configured
- bugfix: $ActionExecOnlyOnce interval did not work properly
Thanks to Tomas Heinrich for the patch
- bugfix: potential abort if ultra-large file io buffers are used and