diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 16:21:01 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 16:21:01 +0200 |
commit | c7b309a662a4310a8b878c036d9440e0b2e345a8 (patch) | |
tree | 17868591721a1cde29e5e9cfaadd92883478ad4a /ChangeLog | |
parent | 4818b0081d3a265a87f9f646d79f2a2ffbcda819 (diff) | |
parent | 1f79c785975261e4158c9b85f6451d5bd00b2495 (diff) | |
download | rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.tar.gz rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.tar.xz rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.zip |
Merge branch 'master' into v5-devel
Conflicts:
runtime/queue.c
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -68,6 +68,11 @@ Version 4.5.0 [DEVEL] (rgerhards), 2009-??-?? * $MainMsgQueueSyncQueueFiles * $ActionQueueSyncQueueFiles - done some memory accesses explicitely atomic +- bugfix: subtle (and usually irrelevant) issue in timout processing + timeout could be one second too early if nanoseconds wrapped +- set a more sensible timeout for shutdow, now 1.5 seconds to complete + processing (this also removes those cases where the shutdown message + was not written because the termination happened before it) --------------------------------------------------------------------------- Version 4.3.2 [beta] (rgerhards), 2009-06-24 - removed long-obsoleted property UxTradMsg |