summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-02 15:42:39 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-02 15:42:39 +0200
commitf0467569d26ad7eafddb324690a55001143f9d91 (patch)
tree4e43d5470c7faec2aca0710211fcb4764478c542
parent7f0c059118f8380f1eb4d9c65c4ddd48441a9d45 (diff)
parentc53e6554b300880e4d8b4e8815ccbe5140eb8b2e (diff)
downloadrsyslog-f0467569d26ad7eafddb324690a55001143f9d91.tar.gz
rsyslog-f0467569d26ad7eafddb324690a55001143f9d91.tar.xz
rsyslog-f0467569d26ad7eafddb324690a55001143f9d91.zip
Merge branch 'beta'
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b6d5613..347afebb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -257,7 +257,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