rsyslog.git/plugins/imptcp, branch v6.3.2

Merge branch 'v5-devel'

2011-06-27T10:33:26+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	tools/omfile.c

step: imklog (linux) moved to v2 config system

2011-05-25T12:04:14+00:00

step: imptcp ported to v2 config system

2011-05-23T20:11:42+00:00

added support to control KEEPALIVE settings in imptcp

2011-05-13T09:07:20+00:00

this has not yet been added to imtcp, but could be done on request

imptcp: added capability to activate keep-alive at socket layer

2011-05-11T10:24:40+00:00

step: imtcp moved to new config interface

2011-05-05T09:36:05+00:00

as far as we know that new interface right now ;)

step: put plumbing in place for new input module config system

2011-05-03T16:02:18+00:00

milestone: ruleset now supports rsconf_t

2011-04-19T10:18:26+00:00

Merge branch 'v5-devel'

2011-03-14T11:49:12+00:00

Conflicts:
	tests/diag.sh

fixed compile problem from epoll_create patch

2011-03-14T08:24:57+00:00