summaryrefslogtreecommitdiffstats
path: root/tests/imtcp_conndrop.sh
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-07-12 12:39:10 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-07-12 12:39:10 +0200
commit2a2a9716f7ee0debd192e75785e347f4e4af0b4d (patch)
tree8d8fef67d1c7bdf11bd193f3ce93dae8e9530ba4 /tests/imtcp_conndrop.sh
parent3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (diff)
parent20607ba1695b99838db7bdf809b22cf52bbdf5ce (diff)
downloadrsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.gz
rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.tar.bz2
rsyslog-2a2a9716f7ee0debd192e75785e347f4e4af0b4d.zip
Merge branch 'master-newconf'
Conflicts: ChangeLog tools/omfile.c
Diffstat (limited to 'tests/imtcp_conndrop.sh')
-rwxr-xr-xtests/imtcp_conndrop.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/imtcp_conndrop.sh b/tests/imtcp_conndrop.sh
index 0bfcd99c..c5073924 100755
--- a/tests/imtcp_conndrop.sh
+++ b/tests/imtcp_conndrop.sh
@@ -4,7 +4,6 @@
# This file is part of the rsyslog project, released under GPLv3
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 imtcp_conndrop.conf
# 100 byte messages to gain more practical data use