rsyslog.git/plugins/omlibdbi, branch ommongodb

upgraded omlibdbi to support the new v6 config format

2012-02-02T16:51:08+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

Merge branch 'v4-stable' into v5-stable

2012-01-14T17:32:40+00:00

Conflicts:
	plugins/imfile/imfile.c
	plugins/omtesting/omtesting.c
	tcpsrv.c
	threads.c

relicense parts under ASL 2.0

2012-01-11T17:30:33+00:00

after carful check for copyright holder

milestone: added module config names

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

Merge branch 'beta'

2011-05-21T02:29:53+00:00

Conflicts:
	ChangeLog
	plugins/imrelp/imrelp.c