summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-15 11:47:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-15 11:47:58 +0200
commit9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8 (patch)
tree10cf3b035fbd24ab2504b4cc7c1118878923e8b7 /ChangeLog
parent5416a94bbe9a24ad9236755a9e21944685fc231b (diff)
parentf7894c401fdb8a2ad7bb3a1d87a74d438cc366c3 (diff)
downloadrsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.gz
rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.xz
rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bcd277e6..d24c086f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
---------------------------------------------------------------------------
+<<<<<<< HEAD:ChangeLog
Version 5.1.3 [DEVEL] (rgerhards), 2009-07-??
- enhance: UDP spoofing supported via new output module omudpspoof
See the omudpspoof documentation for details and samples
@@ -61,6 +62,11 @@ increase.
output module interface
---------------------------------------------------------------------------
Version 4.5.1 [DEVEL] (rgerhards), 2009-07-??
+=======
+Version 4.5.1 [DEVEL] (rgerhards), 2009-07-15
+- CONFIG CHANGE: $HUPisRestart default is now "off". We are doing this
+ to support removal of restart-type HUP in v5.
+>>>>>>> f7894c401fdb8a2ad7bb3a1d87a74d438cc366c3:ChangeLog
- bugfix: fromhost-ip was sometimes truncated
- bugfix: potential segfault when zip-compressed syslog records were
received (double free)
@@ -75,6 +81,12 @@ Version 4.5.1 [DEVEL] (rgerhards), 2009-07-??
- bugfix: message could be truncated after TAG, often when forwarding
This was a result of an internal processing error if maximum field
sizes had been specified in the property replacer.
+- added ability for the TCP output action to "rebind" its send socket after
+ sending n messages (actually, it re-opens the connection, the name is
+ used because this is a concept very similiar to $ActionUDPRebindInterval).
+ New config directive $ActionSendTCPRebindInterval added for the purpose.
+ By default, rebinding is disabled. This is considered useful for load
+ balancers.
- testbench improvements
---------------------------------------------------------------------------
Version 4.5.0 [DEVEL] (rgerhards), 2009-07-02