summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-13 15:01:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-13 15:01:43 +0200
commita61e548958044f9efa013b5911d130ae1930448f (patch)
treeffffceade2526bfdfc43c920b0311afb7b242b56 /ChangeLog
parent66300192944fe2c4390e53549ed51b4b25e79524 (diff)
parent8eb888d049da12e1294a7688432b6325794ade32 (diff)
downloadrsyslog-a61e548958044f9efa013b5911d130ae1930448f.tar.gz
rsyslog-a61e548958044f9efa013b5911d130ae1930448f.tar.xz
rsyslog-a61e548958044f9efa013b5911d130ae1930448f.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog20
1 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 99c4b68c..ece96e90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 3.19.11 [BETA] (rgerhards), 2008-??-??
+- included fixes from v3-stable
---------------------------------------------------------------------------
Version 3.19.10 [BETA] (rgerhards), 2008-07-15
- start of a new beta branch based on former 3.19 devel branch
@@ -157,7 +158,24 @@ Version 3.19.0 (rgerhards), 2008-05-06
- a lot of cleanup in regard to modularization
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
-Version 3.18.2 (rgerhards), 2008-07-??
+---------------------------------------------------------------------------
+Version 3.18.3 (rgerhards), 2008-08-??
+- enhanced ommysql to support custom port to connect to server
+ Port can be set via new $ActionOmmysqlServerPort config directive
+ Note: this was a very minor change and thus deemed appropriate to be
+ done in the stable release.
+- bugfix: misspelled config directive, previously was
+ $MainMsgQueueWorkeTimeoutrThreadShutdown, is now
+ $MainMsgQueueWorkerTimeoutThreadShutdown. Note that the misspelled
+ directive is not preserved - if the misspelled directive was used
+ (which I consider highly unlikely), the config file must be changed.
+ Thanks to lperr for reporting the bug.
+- disabled flow control for imuxsock, as it could cause system hangs
+ under some circumstances. The devel (3.21.3 and above) will
+ re-enable it and provide enhanced configurability to overcome the
+ problems if they occur.
+---------------------------------------------------------------------------
+Version 3.18.2 (rgerhards), 2008-08-08
- merged in IPv6 forwarding address bugfix from v2-stable
---------------------------------------------------------------------------
Version 3.18.1 (rgerhards), 2008-07-21