diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 18:31:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-11 18:31:31 +0200 |
| commit | f72faa803e8c0dfc931f8b2f7fb562441753d5cc (patch) | |
| tree | 9aa7e62327a354651549227eb415569010927ab7 | |
| parent | 829b0639a08a0194efd673b7e0166f385a3dacd5 (diff) | |
| parent | b8916d5cf10130b34ba8982a88d912e9f3f1e1c4 (diff) | |
| download | rsyslog-f72faa803e8c0dfc931f8b2f7fb562441753d5cc.tar.gz rsyslog-f72faa803e8c0dfc931f8b2f7fb562441753d5cc.tar.bz2 rsyslog-f72faa803e8c0dfc931f8b2f7fb562441753d5cc.zip | |
Merge branch 'v6-stable' into beta
Conflicts:
plugins/mmjsonparse/mmjsonparse.c
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -2,6 +2,12 @@ Version 7.1.11 [beta] 2012-10-?? - bugfix: do not crash if set statement is used with date field Thanks to Miloslav Trmač for the patch. +- change lumberjack cookie to "@cee" from "@cee " + CEE originally specified the cookie with SP, whereas other lumberjack + tools used it without space. In order to keep interop with lumberjack, + we now use the cookie without space as well. I hope this can be changed + in CEE as well when it is released at a later time. + Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch. - added deprecated note to omruleset (plus clue to use "call") - added deprecated note to discard action (plus clue to use "stop") --------------------------------------------------------------------------- @@ -162,6 +168,12 @@ Version 6.5.0 [devel] 2012-08-28 http://bugzilla.adiscon.com/show_bug.cgi?id=353 --------------------------------------------------------------------------- Version 6.4.3 [V6-STABLE] 2012-??-?? +- change lumberjack cookie to "@cee" from "@cee " + CEE originally specified the cookie with SP, whereas other lumberjack + tools used it without space. In order to keep interop with lumberjack, + we now use the cookie without space as well. I hope this can be changed + in CEE as well when it is released at a later time. + Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch. - bugfix: comments inside objects (e.g. action()) were not properly handled - bugfix: sysklogd-emulating standard template was no longer present in v6 This was obviously lost during the transition to the new config format. |