summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-11-25 14:47:21 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-11-25 14:47:21 +0100
commit65c7f4689387d61c55280ac9f2aea0317d5b8ee2 (patch)
tree3efb2270f683ed897c6d5f3c4b4919a4c567f919 /ChangeLog
parente4ac19d8ff2a7ef7698048e7c732f4e404f007b8 (diff)
parent40814bb0307f9d8536b3dc4a28b94f80a361b41d (diff)
downloadrsyslog-65c7f4689387d61c55280ac9f2aea0317d5b8ee2.tar.gz
rsyslog-65c7f4689387d61c55280ac9f2aea0317d5b8ee2.tar.xz
rsyslog-65c7f4689387d61c55280ac9f2aea0317d5b8ee2.zip
Merge branch 'v5.6.0a' into v5-stable
Conflicts: configure.ac
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 506650d6..b605aaaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,12 @@ Version 5.6.1 [V5-STABLE] (rgerhards), 2010-11-24
thanks varmojfekoj for the patch
---------------------------------------------------------------------------
Version 5.6.0 [V5-STABLE] (rgerhards), 2010-10-19
+- private build
+- added the $InputFilePersistStateInterval config directive to imfile
+- changed imfile so that the state file is never deleted (makes imfile
+ more robust in regard to fatal failures)
+---------------------------------------------------------------------------
+Version 5.6.0 [V5-STABLE] (rgerhards), 2010-10-19
This release brings all changes and enhancements of the 5.5.x series
to the v5-stable branch.