summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-05-10 10:17:18 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-05-10 10:17:18 +0200
commit6625450cbeee6cd4dc0ecc7418e552833708e95c (patch)
tree8eb6bb2d4bf667ee87df5337d87d14d992ba0c17 /ChangeLog
parent8ce2e3917705186cc708faa68d6b3faeebd0fa32 (diff)
parentb3d54ce6ffa3925e4cf3ee3d4dfafdfeb552e6dd (diff)
downloadrsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.gz
rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.tar.xz
rsyslog-6625450cbeee6cd4dc0ecc7418e552833708e95c.zip
Merge branch 'v5-beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da61061a..76cf1482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ Version 6.3.9 [DEVEL] 2012-04-??
http://bugzilla.adiscon.com/show_bug.cgi?id=299
Thanks to Marcin M for bringing up this problem and Andre Lorbach
for helping to reproduce and fix it.
+- added capability to specify substrings for field extraction mode
---------------------------------------------------------------------------
Version 6.3.8 [DEVEL] 2012-04-16
- added $PStatJSON directive to permit stats records in JSON format
@@ -422,6 +423,9 @@ expected that interfaces, even new ones, break during the initial
syslog plain tcp input plugin (NOT supporting TLS!)
[ported from v4]
---------------------------------------------------------------------------
+Version 5.9.7 [V5-BETA], 2012-05-??
+- bugfix/tcpflood: sending small test files did not work correctly
+---------------------------------------------------------------------------
Version 5.9.6 [V5-BETA], 2012-04-12
- added configuration directives to customize queue light delay marks
- permit size modifiers (k,m,g,...) in integer config parameters