diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 13:07:46 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-19 13:07:46 +0100 |
commit | 6624ad434b5e346a84f600845c09739208382f43 (patch) | |
tree | 1b416935067cbc239499aa2850face4cad05dd7b /ChangeLog | |
parent | 03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9 (diff) | |
parent | b38dd53e08258bc694f16373671be9c1c3deaa0c (diff) | |
download | rsyslog-6624ad434b5e346a84f600845c09739208382f43.tar.gz rsyslog-6624ad434b5e346a84f600845c09739208382f43.tar.xz rsyslog-6624ad434b5e346a84f600845c09739208382f43.zip |
Merge branch 'v6-stable-noscoping' into master
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imfile/imfile.c
plugins/imklog/imklog.c
plugins/immark/immark.c
plugins/imptcp/imptcp.c
plugins/imrelp/imrelp.c
plugins/imtcp/imtcp.c
plugins/imtemplate/imtemplate.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
plugins/mmsnmptrapd/mmsnmptrapd.c
plugins/omtemplate/omtemplate.c
runtime/glbl.c
runtime/parser.c
tools/omfile.c
tools/syslogd.c
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -14,6 +14,15 @@ Version 6.3.7 [DEVEL] 2011-0?-?? closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Thanks to Tomas Heinrich for the patch --------------------------------------------------------------------------- +Version 6.2.1 [v6-stable], 2012-01-?? +- change plugin config interface to be compatible with pre-v6.2 system + The functionality was already removed (because it is superseeded by the + v6.3+ config language), but code was still present. I have now removed + those parts that affect interface. Full removal will happen in v6.3, in + order to limit potential regressions. However, it was considered useful + enough to do the interface change in v6-stable; this also eases merging + branches! +--------------------------------------------------------------------------- Version 6.2.0 [v6-stable], 2012-01-09 - bugfix (kind of): removed numerical part from pri-text see v6 compatibility document for reasons |