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 /runtime | |
| 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 'runtime')
| -rw-r--r-- | runtime/netstrm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/runtime/netstrm.c b/runtime/netstrm.c index f6a8de7f..05bb25c0 100644 --- a/runtime/netstrm.c +++ b/runtime/netstrm.c @@ -114,7 +114,6 @@ AcceptConnReq(netstrm_t *pThis, netstrm_t **ppNew) ISOBJ_TYPE_assert(pThis, netstrm); assert(ppNew != NULL); -RUNLOG_STR("XXX: accept conn reqeust"); /* accept the new connection */ CHKiRet(pThis->Drvr.AcceptConnReq(pThis->pDrvrData, &pNewNsd)); /* construct our object so that we can use it... */ |