diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 11:05:45 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-22 11:05:45 +0100 |
| commit | 42cd1fa7d786a020ef934ed71162f18b464d55bf (patch) | |
| tree | 98ccb728030c6019669577172806ccc452c57af8 /tests/imtcp_addtlframedelim.sh | |
| parent | 014c1818e6d103342199157c341d609741a24f42 (diff) | |
| parent | 59c7a299e9907f81f0970d3523a47f4361466d08 (diff) | |
| download | rsyslog-42cd1fa7d786a020ef934ed71162f18b464d55bf.tar.gz rsyslog-42cd1fa7d786a020ef934ed71162f18b464d55bf.tar.bz2 rsyslog-42cd1fa7d786a020ef934ed71162f18b464d55bf.zip | |
Merge branch 'v7-stable'
Conflicts:
configure.ac
doc/manual.html
plugins/imfile/imfile.c
plugins/imklog/bsd.c
plugins/imklog/imklog.c
plugins/imklog/imklog.h
Diffstat (limited to 'tests/imtcp_addtlframedelim.sh')
| -rwxr-xr-x | tests/imtcp_addtlframedelim.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/imtcp_addtlframedelim.sh b/tests/imtcp_addtlframedelim.sh index 8de7ca58..4c1fd9cb 100755 --- a/tests/imtcp_addtlframedelim.sh +++ b/tests/imtcp_addtlframedelim.sh @@ -3,7 +3,6 @@ # This file is part of the rsyslog project, released under GPLv3 echo ==================================================================================== echo TEST: \[imtcp_addtlframedelim.sh\]: test imtcp additional frame delimiter -cat rsyslog.action.1.include source $srcdir/diag.sh init source $srcdir/diag.sh startup imtcp_addtlframedelim.conf source $srcdir/diag.sh tcpflood -m20000 -F0 -P129 |