rsyslog.git/plugins/imklog, branch master rsyslog development for Lumberjack - various unofficial and potentially rebased branches imklog: add paramter "keepkerneltimestamp" 2012-10-17T15:17:43+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-17T15:17:43+00:00 fa4119e8747eaec739e38e600cae0308db5367e9 Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on. 
Thanks to Marius Tomaschweski for the suggestion and a patch (for v5)
that this commit bases on.
Merge branch 'v6-stable' into beta 2012-10-17T14:56:12+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-17T14:56:12+00:00 a21fe156df563267a177b6fcaccaf90e227874db 






Merge branch 'v5-stable' into v6-stable
2012-10-17T14:51:59+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-17T14:51:59+00:00

db21912aa81b416dffc1b2814ccd768dab7cfac1

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html







imklog: use memmove instead of memcpy (solaris)
2012-10-17T13:04:43+00:00

Marius Tomaschewski
mt@suse.de

2012-10-17T12:44:04+00:00

d4f9c384c2ca643971bbe1557dddf0b6d10a33da












imklog: use memmove to remove kernel timestamp
2012-10-17T12:47:27+00:00

Marius Tomaschewski
mt@suse.de

2012-10-17T09:55:34+00:00

51754401f72376ea5f1c5b74b9c1772ab6f7ae4f












imklog: skip leading spaces in kernel timestamp
2012-10-17T12:46:35+00:00

Marius Tomaschewski
mt@suse.de

2012-10-17T09:29:45+00:00

49a5c0c3b9dbb91e3cdd97b2975a3e12c53fe73e












imklog: removal of no longer needed config directives
2012-06-29T10:59:46+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-06-29T10:59:46+00:00

5a993ad7425bce33380ff10308f2ae93dadf8dae












Merge branch 'beta' into master-module
2012-06-29T10:54:49+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-06-29T10:54:49+00:00

8e8b77c7efc4e2d3844f9e3ce031c2355d2f3024

Conflicts:
	ChangeLog
	configure.ac
	plugins/imklog/imklog.c
	plugins/imklog/imklog.h





Conflicts:
	ChangeLog
	configure.ac
	plugins/imklog/imklog.c
	plugins/imklog/imklog.h







imklog: cleanup of no longer used code
2012-06-29T10:47:13+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-06-29T10:47:13+00:00

99e4bbc0e4bbb6235ccdc7482bb1329880add9c1












imklog: support for module() global config parameters added
2012-06-29T10:42:08+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-06-29T10:42:08+00:00

cb2a78b30bf55fd3d356cad7048b9e70968dbb95