rsyslog.git/plugins/imklog, branch v6.1.10

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

Merge branch 'v5-devel'

2010-12-17T12:20:55+00:00

Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c

Merge branch 'v4-stable' into v5-stable

2010-12-16T12:59:16+00:00

Conflicts:
	ChangeLog
	runtime/parser.c
	runtime/queue.c
	runtime/wtp.c
	template.c
	threads.c
	tools/syslogd.c

some cleanup based on clang static analyzer results

2010-12-16T11:57:55+00:00

Merge branch 'v5-devel'

2010-10-22T18:19:06+00:00

Merge branch 'v4-stable' into v5-stable

2010-10-19T10:54:38+00:00

Conflicts:

	configure.ac
	runtime/cfsysline.c
	tools/ompipe.c

fixing some compile problems on FreeBSD

2010-10-19T10:39:48+00:00

moving towards scoping inside rsyslog.conf

2010-07-21T16:08:19+00:00

first step: adding object-type specifier to config statement table

Merge branch 'v4-devel' into master

2010-04-19T13:13:33+00:00

Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
	runtime/debug.c
	runtime/rsyslog.h
	tests/Makefile.am
	tests/diag.sh
	tests/nettester.c
	tools/syslogd.c