rsyslog.git/plugins/imklog, branch v5.7.4

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 '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

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

first version of imsolaris created, cleanup for solaris done

2010-04-15T15:59:38+00:00

more cleanup required, but things now basically work

some cleanup of solaris imklog

2010-04-12T15:09:50+00:00

Merge branch 'v4-stable-solaris' into beta

2010-04-09T10:27:59+00:00

Conflicts:
	runtime/Makefile.am
	runtime/rsyslog.c
	tests/nettester.c
	tools/syslogd.c

git "bugfix": added file previously forgotten

2010-04-01T13:16:05+00:00

cleanup in solaris components for imklog

2010-03-26T15:59:00+00:00