summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-14 12:49:12 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-14 12:49:12 +0100
commitef45e0ff714767b58e9069a1db78d92ef370e498 (patch)
tree248849f1ba7abfda64bf30a9bc97b472f91955be /ChangeLog
parent5c7162879af11255aea4e6f6e1091a69ce14aff3 (diff)
parentda4c90af2592c1c1f7e55d3445df23131b035e27 (diff)
downloadrsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.tar.gz
rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.tar.xz
rsyslog-ef45e0ff714767b58e9069a1db78d92ef370e498.zip
Merge branch 'v5-devel'
Conflicts: tests/diag.sh
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f6982e6e..3b0b3a35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -151,9 +151,11 @@ Version 5.7.9 [V5-BETA] (rgerhards), 2011-03-??
- improved testbench
among others, life tests for ommysql (against a test database) have
been added, valgrind-based testing enhanced, ...
+- enhance: fallback *at runtime* to epoll_create if epoll_create1 is not
+ available. Thanks to Michael Biebl for analysis and patch!
- bugfix: minor memory leak in omlibdbi (< 1k per instance and run)
- bugfix: (regression) omhdfs did no longer compile
-- bugfix: omlibdbi did not use password from rsyslog.con
+- bugfix: omlibdbi did not use password from rsyslog.conf
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203
---------------------------------------------------------------------------
Version 5.7.8 [V5-BETA] (rgerhards), 2011-03-09