diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-12 16:02:26 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-12 16:02:26 +0200 |
| commit | 6dd21d2d633f5cc33bfcc4c101def87e14555d99 (patch) | |
| tree | 6834c4cf4936ddaf57f71e840c75c2965f4b051d | |
| parent | bf138adcad7367aef8afe8030a132608ba562ce3 (diff) | |
| download | rsyslog-6dd21d2d633f5cc33bfcc4c101def87e14555d99.tar.gz rsyslog-6dd21d2d633f5cc33bfcc4c101def87e14555d99.tar.xz rsyslog-6dd21d2d633f5cc33bfcc4c101def87e14555d99.zip | |
cosmetic: merge remains in ChangeLog cleared up
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,5 +1,4 @@ --------------------------------------------------------------------------- -<<<<<<< HEAD Version 6.5.0 [devel] 2012-0?-?? - imrelp now supports non-cancel thread termination (but now requires at least librelp 1.0.1) @@ -507,8 +506,6 @@ expected that interfaces, even new ones, break during the initial syslog plain tcp input plugin (NOT supporting TLS!) [ported from v4] --------------------------------------------------------------------------- -======= ->>>>>>> 0620fc5780fabdfb160524197fd4aa6bb22613e9 Version 5.9.8 [V5-BETA], 2012-05-?? - bugfix: delayble source could block action queue, even if there was a disk queue associated with it. The root cause of this problem was |