summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-12-01 11:26:24 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-12-01 11:26:24 +0100
commitcb0087ec4736089d73d0368e683b652013483a52 (patch)
tree171c1fca8b7cf2dbb1428bf0cdb428c10bdc577c /ChangeLog
parenteae869a3a4f2ea4c3bf4f54a9b1b61f00fc24f38 (diff)
parent9859818eccb27a330537258d9149c7c5f32292f6 (diff)
downloadrsyslog-cb0087ec4736089d73d0368e683b652013483a52.tar.gz
rsyslog-cb0087ec4736089d73d0368e683b652013483a52.tar.xz
rsyslog-cb0087ec4736089d73d0368e683b652013483a52.zip
Merge branch 'v3-stable' into v4-stable
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f708c821..2014e6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -811,6 +811,9 @@ version before switching to this one.
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
+- bugfix: action resume interval incorrectly handled, thus took longer to
+ resume
+- bugfix: cosmetic: proper constant used instead of number in open call
- bugfix: timestamp was incorrectly calculated for timezones with minute
offset
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271