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

	Commit message (Collapse)	Author	Age	Files	Lines
*	v6.1/2 scoping support removed from plugins	Rainer Gerhards	2012-01-19	1	-3/+2
\|
*	Merge branch 'v6-stable-noscoping' into master	Rainer Gerhards	2012-01-19	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
\| *	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	1	-3/+3
\| \| \| \| \| \| \| \|	The most common files are now changed, more needs to be done.
* \|	milestone: added module config names	Rainer Gerhards	2011-07-20	1	-0/+1
\| \|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-06-27	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
\| *	Merge branch 'v5-stable-imfile-batches' into v5-devel	Rainer Gerhards	2011-06-06	1	-3/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \|	mmsnmptrapd: doc bugfix and fix issue with config stmt handler	Rainer Gerhards	2011-05-13	1	-1/+1
\| \| \|
* \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-05-20	1	-8/+4
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c
* \|	mmsnmptrapd: removed unnecessary includes	Rainer Gerhards	2011-05-12	1	-3/+0
\|/
*	cosmetic cleanup	Rainer Gerhards	2011-05-09	1	-2/+0
\|
*	mmsnmptrapd: added capability to specify severity mapping	Rainer Gerhards	2011-05-09	1	-2/+154
\|
*	mmsnmptrap: added TAG processing	Rainer Gerhards	2011-05-06	1	-1/+77
\|
*	added skeleton for mmsnmptrapd	Rainer Gerhards	2011-05-05	2	-0/+215