rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into master	Rainer Gerhards	2012-01-18	1	-16/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	license changes	Rainer Gerhards	2012-01-16	1	-16/+14
\| \|
* \|	some more cleanup	Rainer Gerhards	2011-07-15	1	-9/+2
\| \| \| \| \| \| \| \|	preparing for a new, higher performance, variant object type
* \|	milestone: added support for CEE-variables to RainerScript	Rainer Gerhards	2010-12-03	1	-0/+1
\|/
*	added capability to create a printable string of a vmprg	Rainer Gerhards	2008-07-07	1	-0/+1
\| \| \| \| \| \|	This is needed so that we can create simple testbenches which will check the result of a test (a generated program) via a simple strcmp.
*	moved runtime files into their own directory	Rainer Gerhards	2008-04-16	1	-0/+70