rsyslog.git/plugins/mmsnmptrapd, branch master

v6.1/2 scoping support removed from plugins

2012-01-19T13:48:40+00:00

Merge branch 'v6-stable-noscoping' into master

2012-01-19T12:07:46+00:00

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

2012-01-18T17:21:08+00:00

The most common files are now changed, more needs to be done.

milestone: added module config names

2011-07-20T08:47:24+00:00

Merge branch 'v5-devel'

2011-06-27T10:33:26+00:00

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

2011-06-06T07:17:27+00:00

Conflicts:
	ChangeLog
	configure.ac

Merge branch 'v5-stable' into beta

2011-05-20T09:48:17+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf_modules.html
	plugins/imrelp/imrelp.c

mmsnmptrapd: doc bugfix and fix issue with config stmt handler

2011-05-13T12:11:34+00:00

mmsnmptrapd: removed unnecessary includes

2011-05-11T23:58:46+00:00

cosmetic cleanup

2011-05-09T10:06:32+00:00