diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-28 08:45:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-28 08:45:48 +0200 |
| commit | 8caf952c8371c871049d5c822f77cd2e4d260be6 (patch) | |
| tree | 11450093fcd1bbc2f0f7915aa9a6c299b913db04 /ChangeLog | |
| parent | 93cbf964ea42aa0b7847c1aa1bbd45f42eb317fb (diff) | |
| download | rsyslog-8caf952c8371c871049d5c822f77cd2e4d260be6.tar.gz rsyslog-8caf952c8371c871049d5c822f77cd2e4d260be6.tar.xz rsyslog-8caf952c8371c871049d5c822f77cd2e4d260be6.zip | |
fix screwed-up ChangeLog
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -1,5 +1,4 @@ --------------------------------------------------------------------------- -<<<<<<< HEAD Version 7.1.5 [devel] 2012-09-25 - implemented RainerScript prifield() function - implemented RainerScript field() function @@ -28,17 +27,6 @@ Version 7.1.4 [devel] 2012-09-19 --------------------------------------------------------------------------- Version 7.1.3 [devel] 2012-09-17 - introduced "set" and "unset" config statements -======= -Version 6.5.1 [devel] 2012-08-?? -- imfile ported to new v6 config interface -- imfile now supports config parameter for maximum number of submits - which is a fine-tuning parameter in regard to input baching -- 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 ->>>>>>> 53df5066688c8472a9f7be5c86bbc253378e6572 - 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 @@ -79,6 +67,14 @@ Version 7.1.0 [devel] 2012-09-06 - imported bugfixes from 6.4.1 --------------------------------------------------------------------------- Version 6.5.1 [devel] 2012-08-?? +- imfile ported to new v6 config interface +- imfile now supports config parameter for maximum number of submits + which is a fine-tuning parameter in regard to input baching +- 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 - added pure JSON output plugin parameter passing mode - ommongodb now supports templates - bugfix: imtcp could abort on exit due to invalid free() |