summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-12-17 12:39:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-12-17 12:39:59 +0100
commit68c13f3f6a691c7f854e6fa4caff43295896dbde (patch)
treec131d2b276384339f189f29738d0a64136e15265 /ChangeLog
parentd3da845a61129c256c3e96fe144ea1dd67bac7c6 (diff)
parentcc8237736d11b54a3d6089d836da7ccb6972a29c (diff)
downloadrsyslog-68c13f3f6a691c7f854e6fa4caff43295896dbde.tar.gz
rsyslog-68c13f3f6a691c7f854e6fa4caff43295896dbde.tar.xz
rsyslog-68c13f3f6a691c7f854e6fa4caff43295896dbde.zip
Merge branch 'v4-devel' into v5-devel
Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 275aeb22..18eb97b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
---------------------------------------------------------------------------
Version 5.7.3 [V5-DEVEL] (rgerhards), 2010-12-??
+- added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settings
+- added $LocalHostName config directive
- bugfix: fixed build problems on some platforms
namely those that have 32bit atomic operations but not 64 bit ones
+- bugfix: local hostname was pulled too-early, so that some config
+ directives (namely FQDN settings) did not have any effect
---------------------------------------------------------------------------
Version 5.7.2 [V5-DEVEL] (rgerhards), 2010-11-26
- bugfix(important): problem in TLS handling could cause rsyslog to loop
@@ -578,7 +582,7 @@ increase.
- increased ompgsql performance by adapting to new transactional
output module interface
---------------------------------------------------------------------------
-Version 4.7.3 [v4-devel] (rgerhards), 2010-??-??
+Version 4.7.3 [v4-devel] (rgerhards), 2010-11-25
- added omuxsock, which permits to write message to local Unix sockets
this is the counterpart to imuxsock, enabling fast local forwarding
- added imptcp, a simplified, Linux-specific and potentielly fast
@@ -636,12 +640,6 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14
Thanks for varmojfekoj for pointing me at this bug.
- imported changes from 4.5.6 and below
---------------------------------------------------------------------------
-Version 4.6.5 [v4-stable] (rgerhards), 2010-??-??
-- bugfix(important): problem in TLS handling could cause rsyslog to loop
- in a tight loop, effectively disabling functionality and bearing the
- risk of unresponsiveness of the whole system.
- Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
----------------------------------------------------------------------------
Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
- bugfix: a couple of problems that imfile had on some platforms, namely
Ubuntu (not their fault, but occured there)