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

	Commit message (Collapse)	Author	Age	Files	Lines
*	ompipe: fix copy&paste name errors	Rainer Gerhards	2012-06-25	1	-3/+3
\|
*	ompipe: support for module() global config parameters added	Rainer Gerhards	2012-06-25	1	-5/+97
\|
*	ompipe: cosmetic, rename var	Rainer Gerhards	2012-01-27	1	-12/+12
\|
*	ompipe: support for v6 config system added	Rainer Gerhards	2012-01-27	1	-8/+63
\|
*	cosmetic: remove compiler warnings	Rainer Gerhards	2012-01-19	1	-1/+1
\|
*	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
\| \| \|
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-09-22	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
\| \| *	Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable	Rainer Gerhards	2011-09-15	1	-0/+2
\| \| \|\
\| \| \| *	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-10-19	1	-0/+1
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/cfsysline.c tools/ompipe.c
\| \| * \| \|	typo fix	Andrew Stothard	2011-09-15	1	-1/+1
\| \| \| \|/ \| \| \|/\|
* \| \| \|	milestone: new output plugin interface call added	Rainer Gerhards	2011-07-21	1	-0/+2
\| \| \| \|
* \| \| \|	merge fix: made mistake when merging in v5-devel changes, now fixing	Rainer Gerhards	2011-04-27	1	-5/+0
\| \| \| \|
* \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-04-26	1	-5/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/omfile.c
\| * \| \| \|	bugfix: pipes not opened in full priv mode when privs are to be dropped	Rainer Gerhards	2011-04-26	1	-5/+13
\| \|/ / /
* \| \| \|	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>
* \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-22	1	-0/+1
\|\\| \| \|
\| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-10-19	1	-0/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
\| \| * \|	fixing some compile problems on FreeBSD	Rainer Gerhards	2010-10-19	1	-0/+1
\| \| \| \|
* \| \| \|	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).
* \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-19	1	-0/+1
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: runtime/msg.h
\| * \|	minor cleanup	Rainer Gerhards	2010-04-19	1	-0/+1
\| \| \|
* \| \|	some cleanup	Rainer Gerhards	2010-04-19	1	-0/+1
\|/ /
* /	added include needed for Solaris	Rainer Gerhards	2010-03-02	1	-0/+1
\|/
*	make $ActonFileDefaultTemplate available to ompipe	Rainer Gerhards	2010-03-01	1	-4/+2
\| \| \| \| \| \| \| \| \|	This was not honored by the new ompipe module, because it is a local file directive (it was applied to pipes as a side-effect of using the same module for pipes and files...). I now made this a global, so that semantics are the same as previously. Not really nice, but probably the best thing to do in the current situation (everything else would involve much more overhead --- leave that for the new config system).
*	some code cleanup	Rainer Gerhards	2010-02-28	1	-4/+2
\|
*	moved pipe code to its own module	Rainer Gerhards	2010-02-28	1	-0/+243
	... based on old omfile. Michael Biebl reported that xconsole seems to have some issues with the new pipe code, so it was best to use the old code for pipes. The optimizations were done to speed up file access, so it doesn't really matter pipes do not receive them.