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

	Commit message (Collapse)	Author	Age	Files	Lines
*	omshell: light cleanup	Rainer Gerhards	2012-01-19	1	-11/+7
\|
*	v6.1/2 scoping support removed from plugins	Rainer Gerhards	2012-01-19	1	-3/+2
\|
*	Merge branch 'v5-stable' into master	Rainer Gerhards	2012-01-18	1	-15/+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
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-14	1	-15/+14
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
\| \| *	more license analysis & change	Rainer Gerhards	2012-01-14	1	-15/+14
\| \| \|
* \| \|	renaming conf.* wasn't a good idea -- undoing	Rainer Gerhards	2011-04-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* \| \|	renamed conf.c to legacyconf.c to make room for new config system	Rainer Gerhards	2011-04-19	1	-1/+1
\| \| \|
* \| \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-03-11	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	Bojan Smojver	2011-02-23	1	-0/+1
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 <rgerhards@adiscon.com>
* \|	fixed regression from last commit	Rainer Gerhards	2010-07-27	1	-0/+1
\| \| \| \| \| \| \| \|	config variables were not properly initialized
* \|	milestone commit: output plugin interface changes (may NOT run)	Rainer Gerhards	2010-07-27	1	-0/+10
\|/ \| \| \| \| \| \|	The output interface has been changed, but we do not yet utilize the new interface. Also, it looks like a regression was introduced. But before hunting it down, I'd like to make a commit (what also easys the regresion hunt).
*	re-enabled pipe, tty and console in omfile	Rainer Gerhards	2009-06-12	1	-1/+1
\| \| \| \| \| \| \|	... by moving code to stream.c. Thanks to the new design, new cases are not really needed, resulting in cleaner code. I also did a cleanup of header file usage as a side-activity.
*	added (internal) error codes to error messages	Rainer Gerhards	2008-06-27	1	-1/+1
\| \| \| \| \|	Also added redirector to web description of error codes closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
*	some more cleanup	Rainer Gerhards	2008-04-16	1	-0/+148
	reduced dependencies, moved non-runtime files to its own directory except for some whom's status is unclear