diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:00:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-27 12:00:14 +0200 |
| commit | 33316de49b7775ac40dd0ec0f4b7ff6256ccde78 (patch) | |
| tree | edeec9b609baf2011838f7dbfcb6fc3bd82f29e7 /ChangeLog | |
| parent | aa9426f683fa6af9280bc63050ee0187ba4c57e1 (diff) | |
| parent | 35ea061f62cf0cbae074b2df47dc6b462da4fd20 (diff) | |
| download | rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.tar.gz rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.tar.xz rsyslog-33316de49b7775ac40dd0ec0f4b7ff6256ccde78.zip | |
Merge branch 'master' into ultra-reliable
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
tests/imtcp-multiport.sh
tests/manytcp.sh
tests/memq-persist.sh
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -7,6 +7,7 @@ --------------------------------------------------------------------------- Version 4.3.? [DEVEL] (rgerhards), 2009-??-?? - bugfix: imdiag/imtcp had a race condition +- improved testbench (now much better code design and reuse) --------------------------------------------------------------------------- Version 4.3.1 [DEVEL] (rgerhards), 2009-05-25 - added capability to run multiple tcp listeners (on different ports) |