13 Commits

Author SHA1 Message Date
Rainer Gerhards
535d6cf0b8 v6.1/2 scoping support removed from plugins 2012-01-19 14:48:40 +01:00
Rainer Gerhards
6624ad434b Merge branch 'v6-stable-noscoping' into master
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
2012-01-19 13:07:46 +01:00
Rainer Gerhards
9b24152b6a undoing v6.1 config scoping interface, part I
The most common files are now changed, more needs to be done.
2012-01-18 18:21:08 +01:00
Rainer Gerhards
a7e3afb20b milestone: added module config names 2011-07-20 10:47:24 +02:00
Rainer Gerhards
8488d8c3c1 Merge branch 'v5-devel'
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
2011-06-27 12:33:26 +02:00
Rainer Gerhards
ee403c2ad7 Merge branch 'v5-stable-imfile-batches' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
2011-06-06 09:17:27 +02:00
Rainer Gerhards
ac32d356b5 Merge branch 'v5-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf_modules.html
	plugins/imrelp/imrelp.c
2011-05-20 11:48:17 +02:00
Rainer Gerhards
4de5aa20bc mmsnmptrapd: doc bugfix and fix issue with config stmt handler 2011-05-13 14:11:34 +02:00
Rainer Gerhards
687aaaab17 mmsnmptrapd: removed unnecessary includes 2011-05-12 01:58:46 +02:00
Rainer Gerhards
1be2f42bdc cosmetic cleanup 2011-05-09 12:06:32 +02:00
Rainer Gerhards
d155c81057 mmsnmptrapd: added capability to specify severity mapping 2011-05-09 11:37:26 +02:00
Rainer Gerhards
e06cebe127 mmsnmptrap: added TAG processing 2011-05-06 08:11:44 +02:00
Rainer Gerhards
d0b5d64c26 added skeleton for mmsnmptrapd 2011-05-05 12:19:58 +02:00