summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-02-18 16:52:08 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-02-18 16:52:08 +0100
commita8760241a30dc2618c53c569d23acdec1e06908e (patch)
tree3144034ca0a8caf530fbea4b5254d501ab389c09 /ChangeLog
parent8538bbe5afdb2a87f31de38ad26bc519235b4512 (diff)
parent2f1ef6164afa3a91f0bdd92507d0e8d557bea555 (diff)
downloadrsyslog-a8760241a30dc2618c53c569d23acdec1e06908e.tar.gz
rsyslog-a8760241a30dc2618c53c569d23acdec1e06908e.tar.xz
rsyslog-a8760241a30dc2618c53c569d23acdec1e06908e.zip
Merge branch 'v5-beta'
Conflicts: plugins/imfile/imfile.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d7a1ca0b..5692d9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,6 +101,10 @@ expected that interfaces, even new ones, break during the initial
[ported from v4]
---------------------------------------------------------------------------
Version 5.7.5 [V5-BETA] (rgerhards), 2011-02-??
+- enhance: imfile did not yet support multiple rulesets, now added
+ we do this directly in the beta because a) it does not affect existing
+ functionality and b) one may argue that this missing functionality is
+ close to a bug.
- bugfix: minor race condition in action.c - considered cosmetic
This is considered cosmetic as multiple threads tried to write exactly
the same value into the same memory location without sync. The method