diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:16:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:16:40 +0200 |
| commit | 9b06a4c26422b0a8727e1b3c6cc7141226186105 (patch) | |
| tree | 4fdc45a5374e3c701785ea90cffebeae6d4b5a58 | |
| parent | 7f0cd8c8b93ca395949e5d28c3a8f422e6695c8d (diff) | |
| parent | fb5cd633e6f4852841354fcf55c971063cc6a871 (diff) | |
| download | rsyslog-9b06a4c26422b0a8727e1b3c6cc7141226186105.tar.gz rsyslog-9b06a4c26422b0a8727e1b3c6cc7141226186105.tar.bz2 rsyslog-9b06a4c26422b0a8727e1b3c6cc7141226186105.zip | |
Merge branch 'v5-beta'
Conflicts:
plugins/imptcp/imptcp.c
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -405,6 +405,8 @@ Version 5.9.6 [V5-BETA], 2012-04-12 his help in testing the fix. - bugfix: imklog invalidly computed facility and severity closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 +- bugfix: imptcp input name could not be set + config directive was accepted, but had no effect - added configuration directive to disable octet-counted framing for imtcp, directive is $InputTCPServerSupportOctetCountedFraming for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming @@ -530,6 +532,8 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- Version 5.8.11 [V5-stable] 2012-04-?? +- bugfix: imptcp input name could not be set + config directive was accepted, but had no effect - bugfix: assigned ruleset was lost when using disk queues This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages |