summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-11-26 14:22:52 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2008-11-26 14:22:52 +0100
commit86614327c5d33da00042f0330160d9ea4804b3dc (patch)
tree6fb202d00fe2577a9ec3baf9dd32574a78dc398a /ChangeLog
parentdbc8762aebc66085d67bb04bb58bee56ce204596 (diff)
parent2275a915e02ca4fd1cd1b3c450b0089ae98bc907 (diff)
downloadrsyslog-86614327c5d33da00042f0330160d9ea4804b3dc.tar.gz
rsyslog-86614327c5d33da00042f0330160d9ea4804b3dc.tar.xz
rsyslog-86614327c5d33da00042f0330160d9ea4804b3dc.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fe8df1fc..66af15d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Version 4.1.1 [DEVEL] (rgerhards), 2008-11-??
$PrivDropToUserID config directives to enable dropping privileges.
This is an effort to provide a security enhancement. For the limits of this
approach, see http://wiki.rsyslog.com/index.php/Security
+- re-enabled imklog to compile on FreeBSD (brought in from beta)
---------------------------------------------------------------------------
Version 4.1.0 [DEVEL] (rgerhards), 2008-11-18
@@ -40,6 +41,9 @@ version before switching to this one.
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
+Version 3.21.8 [BETA] (rgerhards), 2008-11-??
+- bugfix: imklog did not compile on FreeBSD
+---------------------------------------------------------------------------
Version 3.21.7 [BETA] (rgerhards), 2008-11-11
- this is the new beta branch, based on the former 3.21.6 devel
- new functionality: ZERO property replacer nomatch option (from v3-stable)