diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-13 12:12:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-13 12:12:33 +0200 |
| commit | 36b9e37896b2ce89494cc354b3d10cb689ec1ee5 (patch) | |
| tree | cc4b770fdb90750d2b5e490c94251f22634c0674 | |
| parent | b32060e2ed078a232dcda723ed7599463e40eb85 (diff) | |
| download | rsyslog-36b9e37896b2ce89494cc354b3d10cb689ec1ee5.tar.gz rsyslog-36b9e37896b2ce89494cc354b3d10cb689ec1ee5.tar.bz2 rsyslog-36b9e37896b2ce89494cc354b3d10cb689ec1ee5.zip | |
fix ChangeLog
got messed-up during merge :-(
| -rw-r--r-- | ChangeLog | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -1,9 +1,22 @@ --------------------------------------------------------------------------- -<<<<<<< HEAD Version 6.5.1 [devel] 2012-08-?? - added pure JSON output plugin parameter passing mode - ommongodb now supports templates - bugfix: imtcp could abort on exit due to invalid free() +- bugfix: remove invalid socket option call from imuxsock + Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom +- bugfix: missing support for escape sequences in RainerScript + only \' was supported. Now the usual set is supported. Note that v5 + used \x as escape where x was any character (e.g. "\n" meant "n" and NOT + LF). This also means there is some incompatibility to v5 for well-know + sequences. Better break it now than later. +- bugfix: remove invalid socket option call from imuxsock + Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom +- bugfix: missing support for escape sequences in RainerScript + only \' was supported. Now the usual set is supported. Note that v5 + used \x as escape where x was any character (e.g. "\n" meant "n" and NOT + LF). This also means there is some incompatibility to v5 for well-know + sequences. Better break it now than later. --------------------------------------------------------------------------- Version 6.5.0 [devel] 2012-08-28 - imrelp now supports non-cancel thread termination @@ -29,7 +42,7 @@ Version 6.5.0 [devel] 2012-08-28 Thanks to Jérôme Renard for the idea and patches. Note: patches were released under ASL 2.0, see http://bugzilla.adiscon.com/show_bug.cgi?id=353 -======= +--------------------------------------------------------------------------- Version 6.4.2 [V6-STABLE] 2012-09-?? - bugfix: remove invalid socket option call from imuxsock Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom @@ -38,7 +51,6 @@ Version 6.4.2 [V6-STABLE] 2012-09-?? used \x as escape where x was any character (e.g. "\n" meant "n" and NOT LF). This also means there is some incompatibility to v5 for well-know sequences. Better break it now than later. ->>>>>>> 11910c59138332a884ed753401afdd84feeb1832 --------------------------------------------------------------------------- Version 6.4.1 [V6-STABLE] 2012-09-06 - bugfix: multiple main queues with same queue file name were not detected |