summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-26 17:00:12 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-26 17:00:12 +0100
commit46ac70bb3073295f70bdddc8359d056bc0651909 (patch)
tree98b42b96616bc087980b0ddff9609f9174599d9e /ChangeLog
parent3ab759c40d34f518744efa9b266640784fc3655f (diff)
parentb6ce75cb6ce65a468f9551d98a641b407a4f2630 (diff)
downloadrsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.gz
rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.tar.xz
rsyslog-46ac70bb3073295f70bdddc8359d056bc0651909.zip
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 26dfda48..e6968dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ Version 4.6.3 [v4-stable] (rgerhards), 2010-03-??
- bugfix: local unix system log socket was deleted even when it was
not configured
---------------------------------------------------------------------------
-Version 4.6.2 [v4-stable] (rgerhards), 2010-03-??
+Version 4.6.2 [v4-stable] (rgerhards), 2010-03-26
- new feature: "." action type added to support writing files to relative
pathes (this is primarily meant as a debug aid)
- added replacements for atomic instructions on systems that do not