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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v6-stable-noscoping' into master	Rainer Gerhards	2012-01-19	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 II (now finished)	Rainer Gerhards	2012-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch.
* \|	milestone: added module config names	Rainer Gerhards	2011-07-20	1	-0/+1
\| \|
* \|	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-devel'	Rainer Gerhards	2011-04-15	1	-3/+11
\|\ \| \| \| \| \| \| \| \|	Conflicts: plugins/impstats/impstats.c
\| *	sm_cust_bindcdr: updated field mapping according to spec received today	Rainer Gerhards	2011-04-15	1	-3/+11
\| \|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-03-31	1	-1/+1
\|/ \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
*	did mapping of data items to database table columns	Rainer Gerhards	2011-03-29	1	-14/+9
\| \| \| \|	to facilitate testing
*	sm_cust_bindcdr: custom date parsing added	Rainer Gerhards	2011-03-28	1	-10/+90
\|
*	sm_bind_cdr: added capability to configure "allowed IPs"	Rainer Gerhards	2011-03-22	1	-3/+80
\|
*	added internal processing of BIND records	Rainer Gerhards	2011-03-22	1	-6/+115
\| \| \| \| \|	still some questions outstanding, so actual SQL statement is not usable at the moment
*	bugfix: strgen could not be used together with database outputs	Rainer Gerhards	2011-03-21	1	-1/+1
\| \| \| \| \| \|	because the sql/stdsql option could not be specified. This has been solved by permitting the strgen to include the opton inside its name. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=195
*	setup test environment and test code in order to look at...	Rainer Gerhards	2011-03-17	1	-31/+14
\| \| \| \| \|	bug http://bugzilla.adiscon.com/show_bug.cgi?id=195 That bug currently prevents strgen's to be used with databases
*	prepared skeleton for new strgen module	Rainer Gerhards	2011-03-17	2	-0/+144