rsyslog.git/plugins/omprog, branch ommongodb

Merge branch 'v6-stable'

2012-01-27T12:52:27+00:00

Conflicts:
	plugins/imklog/imklog.c
	plugins/imklog/imklog.h
	runtime/conf.c
	runtime/rsyslog.h

Merge branch 'v5-stable' into v6-stable

2012-01-27T11:58:32+00:00

Conflicts:
	ChangeLog
	plugins/omprog/omprog.c
	runtime/rsyslog.h

Merge branch 'v4-stable' into v5-stable

2012-01-27T11:50:19+00:00

bugfix: omprog made rsyslog abort on startup if not binary to execute was configured

2012-01-27T11:49:54+00:00

omprog: added support for v6 config system

2012-01-27T11:43:48+00:00

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 II (now finished)

2012-01-19T11:33:12+00:00

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.

Merge branch 'v5-stable' into master

2012-01-18T13:08:24+00:00

Conflicts:
	ChangeLog
	action.h
	configure.ac
	doc/manual.html
	plugins/immark/immark.c
	plugins/impstats/impstats.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	runtime/cfsysline.c
	runtime/cfsysline.h
	runtime/conf.c
	runtime/ctok.c
	runtime/ctok.h
	runtime/ctok_token.c
	runtime/ctok_token.h
	runtime/dnscache.h
	runtime/expr.c
	runtime/expr.h
	runtime/rule.c
	runtime/rule.h
	runtime/ruleset.h
	runtime/sysvar.c
	runtime/vm.h
	runtime/vmop.c
	runtime/vmop.h
	runtime/vmprg.c
	runtime/vmprg.h
	runtime/vmstk.c
	runtime/vmstk.h
	tools/omusrmsg.c

Merge branch 'v5-stable' into v6-stable

2012-01-14T17:35:09+00:00

Conflicts:
	plugins/imtcp/imtcp.c