summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:30:30 +0200
committerAndre Lorbach <alorbach@adiscon.com>2011-08-05 14:30:30 +0200
commit0bf454aba2b62618ab6c2a7c4b17641c0bce297b (patch)
treedfad92a5d03cdac5d4609ce94257c95dad9bc059 /ChangeLog
parentb04a5b89e4c730f861a4e21479d9f2c69b28828f (diff)
parentece1cb640926848d0d155f29b01a6406af441cb0 (diff)
downloadrsyslog-0bf454aba2b62618ab6c2a7c4b17641c0bce297b.tar.gz
rsyslog-0bf454aba2b62618ab6c2a7c4b17641c0bce297b.tar.xz
rsyslog-0bf454aba2b62618ab6c2a7c4b17641c0bce297b.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog18
1 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b7e04890..86520526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
---------------------------------------------------------------------------
+Version 6.3.5 [DEVEL] (al), 2011-??-??
+- bugfix: potential misadressing in property replacer
+---------------------------------------------------------------------------
Version 6.3.4 [DEVEL] (rgerhards), 2011-08-02
- added support for action() config object
* in rsyslog core engine
@@ -43,9 +46,13 @@ Version 6.3.2 [DEVEL] (rgerhards), 2011-07-06
This leak is tied to error conditions which lead to incorrect cleanup
of some data structures.
---------------------------------------------------------------------------
-Version 6.1.11 [BETA] (rgerhards), 2011-06-??
-- added support for the ":omusrmsg:" syntax in configuring user messages
+Version 6.1.12 [BETA] (al), 2011-??-??
+- bugfix: potential misadressing in property replacer
+---------------------------------------------------------------------------
+Version 6.1.11 [BETA] (rgerhards), 2011-07-11
- systemd support: set stdout/stderr to null - thx to Lennart for the patch
+- added support for the ":omusrmsg:" syntax in configuring user messages
+- added support for the ":omfile:" syntax in configuring user messages
---------------------------------------------------------------------------
Version 6.1.10 [BETA] (rgerhards), 2011-06-22
- bugfix: problems in failover action handling
@@ -333,6 +340,9 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08
affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
---------------------------------------------------------------------------
+Version 5.8.4 [V5-stable] (al), 2011-??-??
+- bugfix: potential misadressing in property replacer
+---------------------------------------------------------------------------
Version 5.8.3 [V5-stable] (rgerhards), 2011-07-11
- systemd support: set stdout/stderr to null - thx to Lennart for the patch
- added support for the ":omusrmsg:" syntax in configuring user messages
@@ -1189,6 +1199,9 @@ 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.8 [v4-stable] (rgerhards), 2011-??-??
+- bugfix: potential misadressing in property replacer
+---------------------------------------------------------------------------
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 for actions
@@ -1894,6 +1907,7 @@ Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
offset
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
- improved some code based on clang static analyzer results
+- bugfix: potential misadressing in property replacer
---------------------------------------------------------------------------
Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24
- bugfix(important): problem in TLS handling could cause rsyslog to loop