summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-02 17:18:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-02 17:18:43 +0200
commit90ed676c54c05cc87f0dbde96447abc8efc166d8 (patch)
tree06bba2fa1e6fd8e5ed70c13657f8c17ccd07a65a /ChangeLog
parente9c659c1578a114fa6e0d9cdf2729b60ba078a91 (diff)
parentb37a1eb0f8422102c11c597f15139d64c2d51c13 (diff)
downloadrsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.gz
rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.xz
rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.zip
Merge branch 'master' into v5-devel
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e9d39de..e9e51726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,7 +43,7 @@ increase.
- increased ompgsql performance by adapting to new transactional
output module interface
---------------------------------------------------------------------------
-Version 4.5.0 [DEVEL] (rgerhards), 2009-??-??
+Version 4.5.0 [DEVEL] (rgerhards), 2009-07-02
- activation order of inputs changed, they are now activated only after
privileges are dropped. Thanks to Michael Terry for the patch.
- greatly improved performance
@@ -301,7 +301,7 @@ version before switching to this one.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
-Version 3.22.1 [v3-stable] (rgerhards), 2009-04-??
+Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02
- bugfix: invalid error message issued if $inlcudeConfig was on an empty
set of files (e.g. *.conf, where none such files existed)
thanks to Michael Biebl for reporting this bug