rsyslog.git/plugins/im3195, branch master

Merge branch 'v5-stable' into master

2012-01-18T13:08:24+00:00

Conflicts:
	ChangeLog
	action.h
	configure.ac
	doc/manual.html
	plugins/immark/immark.c
	plugins/impstats/impstats.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	runtime/cfsysline.c
	runtime/cfsysline.h
	runtime/conf.c
	runtime/ctok.c
	runtime/ctok.h
	runtime/ctok_token.c
	runtime/ctok_token.h
	runtime/dnscache.h
	runtime/expr.c
	runtime/expr.h
	runtime/rule.c
	runtime/rule.h
	runtime/ruleset.h
	runtime/sysvar.c
	runtime/vm.h
	runtime/vmop.c
	runtime/vmop.h
	runtime/vmprg.c
	runtime/vmprg.h
	runtime/vmstk.c
	runtime/vmstk.h
	tools/omusrmsg.c

Merge branch 'v4-stable' into v5-stable

2012-01-14T17:32:40+00:00

Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c

relicense parts under ASL 2.0

2012-01-11T17:30:33+00:00

after carful check for copyright holder

added $InputRELPServerBindRuleset directive to specify rulesets for RELP

2011-09-08T13:05:04+00:00

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

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

fixed compile-time problems in im3195

2009-04-09T17:17:35+00:00

... however, I did not not a test run due to the lack of
existing test drivers and the very low (aka "non-existing" interest
from the userbase in the feature).