rsyslog.git/plugins/imgssapi, branch ommongodb

Merge branch 'v5-stable-newstats'

2012-04-07T13:42:46+00:00

Conflicts:
	action.c
	configure.ac
	doc/imuxsock.html
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
	runtime/glbl.h
	runtime/net.c
	runtime/ruleset.c
	tcpsrv.h
	tools/syslogd.c

added configuration directive to disable octet-counted framing

2012-03-19T14:28:25+00:00

... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming

Merge branch 'v6-stable-noscoping' into master

2012-01-19T12:07:46+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/immark/immark.c
	plugins/imptcp/imptcp.c
	plugins/imrelp/imrelp.c
	plugins/imtcp/imtcp.c
	plugins/imtemplate/imtemplate.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	plugins/omtemplate/omtemplate.c
	runtime/glbl.c
	runtime/parser.c
	tools/omfile.c
	tools/syslogd.c

undoing v6.1 config scoping interface, part II (now finished)

2012-01-19T11:33:12+00:00

This concludes the removal of the new scoping interface, at least as
far as pre v6-plugins are affected. Full code cleanup will happen
in the v6.3 branch.

milestone: added module config names

2011-07-20T08:47:24+00:00

step: generalized new config interface for all module types

2011-05-06T06:43:15+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

Merge branch 'v5-beta'

2011-03-11T09:24:58+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh

added work-around for bug in gtls, which causes fd leak when using TLS

2011-02-23T10:25:43+00:00

The capability has been added for module to specify that they do not
like being unloaded.
related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222

Signed-off-by: Rainer Gerhards