summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-21 10:51:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-21 10:51:43 +0200
commit3187982c3c94e5eac257e206f19fa7326c8e7739 (patch)
tree6e5049e12d7fde51015ceccb81ccdf043c55f2c1
parentd30526568c77ceddedd47dd0c309c2224bb74ba0 (diff)
parentb513239352dd0c2c2fbf94e08af664e09a4bed41 (diff)
downloadrsyslog-3187982c3c94e5eac257e206f19fa7326c8e7739.tar.gz
rsyslog-3187982c3c94e5eac257e206f19fa7326c8e7739.tar.xz
rsyslog-3187982c3c94e5eac257e206f19fa7326c8e7739.zip
Merge branch 'aaron' into v4-beta
Conflicts: ChangeLog
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3233000f..6583395a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@ Version 4.5.6 [v4-beta] (rgerhards), 2009-09-??
* bugfix: random data could be appended to message
* bugfix: reverse lookup reduction logic in imudp do DNS queries too often
---------------------------------------------------------------------------
-Version 4.5.5 [v4-beta] (rgerhards), 2009-09-??
+Version 4.5.5 [v4-beta] (rgerhards), 2009-10-21
- added $InputTCPServerNotifyOnConnectionClose config directive
see doc for details
- bugfix: debug string larger than 1K were improperly displayed. Max size