diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:03:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:03:51 +0100 |
| commit | 0b5fe246b55635d8eaf3182ddad8961c7d3757c2 (patch) | |
| tree | 2e9c645db556827d616410833a01e448358aa3fd /ChangeLog | |
| parent | 2f8cd1aba769c536cebdebc26c20b9a6b1b00fad (diff) | |
| parent | 16cc84fc699fc3f830b0c28d677d6ae0daa35723 (diff) | |
| download | rsyslog-0b5fe246b55635d8eaf3182ddad8961c7d3757c2.tar.gz rsyslog-0b5fe246b55635d8eaf3182ddad8961c7d3757c2.tar.xz rsyslog-0b5fe246b55635d8eaf3182ddad8961c7d3757c2.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -12,6 +12,8 @@ Version 6.2.1 [v6-stable], 2012-01-?? execute was configured - bugfix: imklog invalidly computed facility and severity closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 +- bugfix: stopped DA queue was never processed after a restart due to a + regression from statistics module --------------------------------------------------------------------------- Version 6.2.0 [v6-stable], 2012-01-09 - bugfix (kind of): removed numerical part from pri-text @@ -259,7 +261,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- -Version 5.8.8 [V5-stable] 2012-0?-?? +Version 5.8.9 [V5-stable] 2012-03-?? +- bugfix: stopped DA queue was never processed after a restart due to a + regression from statistics module +--------------------------------------------------------------------------- +Version 5.8.8 [V5-stable] 2012-03-05 - bugfix: omprog made rsyslog abort on startup if not binary to execute was configured - bugfix: imklog invalidly computed facility and severity |