diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-27 16:25:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-27 16:25:53 +0200 |
| commit | a96e4966677d21e8bda6ed47b2ee72f565478562 (patch) | |
| tree | 485ddc0c5628cad7dbc13be0760a7a936216a63f /ChangeLog | |
| parent | 4cc23e9dc9e906e18539015081b2e5ad16b29417 (diff) | |
| parent | 53df5066688c8472a9f7be5c86bbc253378e6572 (diff) | |
| download | rsyslog-a96e4966677d21e8bda6ed47b2ee72f565478562.tar.gz rsyslog-a96e4966677d21e8bda6ed47b2ee72f565478562.tar.xz rsyslog-a96e4966677d21e8bda6ed47b2ee72f565478562.zip | |
Merge branch 'v6-devel'
Conflicts:
ChangeLog
action.c
grammar/grammar.y
runtime/modules.h
runtime/rsconf.c
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -1,4 +1,5 @@ --------------------------------------------------------------------------- +<<<<<<< HEAD Version 7.1.5 [devel] 2012-09-25 - implemented RainerScript prifield() function - implemented RainerScript field() function @@ -27,6 +28,17 @@ 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 @@ -81,6 +93,8 @@ Version 6.5.1 [devel] 2012-08-?? these were one-time memory leaks during startup, so they did NOT grow during runtime - bugfix: config validation run did not always return correct return state +- bugfix: config errors did not always cause statement to fail + This could lead to startup with invalid parameters. --------------------------------------------------------------------------- Version 6.5.0 [devel] 2012-08-28 - imrelp now supports non-cancel thread termination |