summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-11 09:02:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-11 09:02:09 +0200
commit53265e3c7403c290158b70f7efad2b9388a06e6c (patch)
tree6fd45b1de23595348f5f011cff83b5877bac4d73 /ChangeLog
parent6afbb39ea197623688e36b74f81f5ec45d0b15ff (diff)
parentdc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff)
downloadrsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.gz
rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.xz
rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.zip
Merge branch 'v4-stable' into v4-devel
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog18
1 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dae6adbc..10f37806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
---------------------------------------------------------------------------
-Version 4.7.4 [v4-???] (rgerhards), 2010-11-??
-- bugfix: PRI was invalid on Solaris for message from local log socket
+Version 4.7.4 [v4-beta] (rgerhards), 2010-11-??
+- added support for the ":omusrmsg:" syntax in configuring user messages
+- added support for the ":omfile:" syntax in configuring user messages
- added $LocalHostName config directive
+- bugfix: PRI was invalid on Solaris for message from local log socket
- bugfix: local hostname was pulled too-early, so that some config
directives (namely FQDN settings) did not have any effect
- bugfix: atomic increment for msg object may not work correct on all
@@ -73,7 +75,11 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14
(bugs require certain non-standard settings to appear)
Thanks to varmojfekoj for the patch [imported from 4.5.8]
---------------------------------------------------------------------------
-Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
+Version 4.6.7 [v4-stable] (rgerhards), 2011-07-11
+- added support for the ":omusrmsg:" syntax in configuring user messages
+- added support for the ":omfile:" syntax in configuring user messages
+---------------------------------------------------------------------------
+Version 4.6.6 [v4-stable] (rgerhards), 2011-06-24
- bugfix: memory leak in imtcp & subsystems under some circumstances
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures. [backport from v6, limited testing under v4]
@@ -129,6 +135,9 @@ Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
discarded (due to QUEUE_FULL or similar problem)
- bugfix: a slightly more informative error message when a TCP
connections is aborted
+- bugfix: timestamp was incorrectly calculated for timezones with minute
+ offset
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
- some improvements thanks to clang's static code analyzer
o overall cleanup (mostly unnecessary writes and otherwise unused stuff)
o bugfix: fixed a very remote problem in msg.c which could occur when
@@ -768,6 +777,9 @@ version before switching to this one.
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
+- bugfix: timestamp was incorrectly calculated for timezones with minute
+ offset
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
- improved some code based on clang static analyzer results
---------------------------------------------------------------------------
Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24