rsyslog.git/plugins, branch v6.1.10 rsyslog development for Lumberjack - various unofficial and potentially rebased branches Merge branch 'v5-stable' into beta 2011-05-20T09:48:17+00:00 Rainer Gerhards rgerhards@adiscon.com 2011-05-20T09:48:17+00:00 ac32d356b5b776e0ca549d5c689a8932af4c2171 Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf_modules.html
	plugins/imrelp/imrelp.c
Merge branch 'v4-stable' into v5-stable 2011-05-20T09:36:22+00:00 Rainer Gerhards rgerhards@adiscon.com 2011-05-20T09:36:22+00:00 1d86889922cb9232819b4451afce091e8a0ad938 






cleanup: removed useless & undocumented config directive from imrelp
2011-05-20T09:35:26+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-20T09:35:26+00:00

f847c2dda32488034f252e3bbd1a267714b99ff0












omlibdbi: added necessary include
2011-05-12T00:00:13+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-12T00:00:13+00:00

8ca5c6b27feb46efbf6d3e3b8a78b0f839bfe613












mmsnmptrapd: removed unnecessary includes
2011-05-11T23:58:46+00:00

Rainer Gerhards
rgerhards@adiscon.com

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

687aaaab178fb098fa27a5921762deaa0ac4728c












undo accidental removal of a component
2011-05-10T07:24:48+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-10T07:24:48+00:00

44dab25c55b41219dd9e865c3aac93114757f5ba












mmsnmptrapd: added doc & mentioned in ChangeLog
2011-05-10T07:04:23+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-10T07:04:23+00:00

e8a71cd0d6ea72cb6495305286cb778b9d951e0c












Merge branch 'v5-stable' into beta
2011-05-09T13:07:22+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-09T13:07:22+00:00

fd4a54698cee48da073622f7d6ac49c94ccb1808

Conflicts:
	tools/omfwd.c





Conflicts:
	tools/omfwd.c







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

Rainer Gerhards
rgerhards@adiscon.com

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

1be2f42bdc961bbe1ae02feae3e078eeb775ea24












mmsnmptrapd: added capability to specify severity mapping
2011-05-09T09:37:26+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-09T09:37:26+00:00

d155c81057f66fe0e3acf5e79ba5dd7929416560