summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-03-08 18:18:29 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-03-08 18:18:29 +0100
commit97f6fa81fd565232ad66082eece4cef207b3060b (patch)
tree0100955b38804d5fad985592b6e8d12c5c72daf8
parent5d3783b0c0449df1d4d1b0d38ce35dc2995ce22a (diff)
parent027e6434c97c102d6c67648a49cb1ccc378346d2 (diff)
downloadrsyslog-97f6fa81fd565232ad66082eece4cef207b3060b.tar.gz
rsyslog-97f6fa81fd565232ad66082eece4cef207b3060b.tar.xz
rsyslog-97f6fa81fd565232ad66082eece4cef207b3060b.zip
Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable
-rwxr-xr-xtests/imtcp_conndrop.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/imtcp_conndrop.sh b/tests/imtcp_conndrop.sh
index 2caa0ce2..9855ee3b 100755
--- a/tests/imtcp_conndrop.sh
+++ b/tests/imtcp_conndrop.sh
@@ -6,7 +6,7 @@ echo ===========================================================================
echo TEST: \[imtcp_conndrop.sh\]: test imtcp with random connection drops
cat rsyslog.action.1.include
source $srcdir/diag.sh init
-source $srcdir/diag.sh startup imptcp_large.conf
+source $srcdir/diag.sh startup imtcp_conndrop.conf
# 100 byte messages to gain more practical data use
source $srcdir/diag.sh tcpflood -c20 -m50000 -r -d100 -P129 -D
sleep 4 # due to large messages, we need this time for the tcp receiver to settle...