summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-14 16:06:25 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-14 16:06:25 +0200
commitb03e81d679152a546eb04392863eb75d5ae9da35 (patch)
tree110daf60e6442505a22efc687e5270970d8e0148
parent27d70409f7175b29452deb3b66c6e34140e20a61 (diff)
parentc179a9c5c2dcc7d9ee3f58a027e48624d56a0d0d (diff)
downloadrsyslog-b03e81d679152a546eb04392863eb75d5ae9da35.tar.gz
rsyslog-b03e81d679152a546eb04392863eb75d5ae9da35.tar.xz
rsyslog-b03e81d679152a546eb04392863eb75d5ae9da35.zip
Merge branch 'beta'
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b6904c52..5dba0dbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -155,6 +155,11 @@ Version 3.18.1 (rgerhards), 2008-07-??
unlikely to happen after a successful startup (the only window of
exposure may be a relatively seldom executed action running in queued
mode). This has been corrected. Thank to HKS for point out the problem.
+- bugfix: priority was incorrectly calculated on FreeBSD 7,
+ because the LOG_MAKEPRI() C macro has a different meaning there (it
+ is just a simple addition of faciltity and severity). I have changed
+ this to use own, consistent, code for PRI calculation. [Backport from
+ 3.19.10]
---------------------------------------------------------------------------
Version 3.18.0 (rgerhards), 2008-07-11
- begun a new v3-stable based on former 3.17.4 beta plus patches to