rsyslog.git/plugins/sm_cust_bindcdr, branch master

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.

milestone: added module config names

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

renaming conf.* wasn't a good idea -- undoing

2011-04-19T06:24:25+00:00

too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".

renamed conf.c to legacyconf.c to make room for new config system

2011-04-19T05:53:23+00:00

Merge branch 'v5-devel'

2011-04-15T12:51:29+00:00

Conflicts:
	plugins/impstats/impstats.c

sm_cust_bindcdr: updated field mapping according to spec received today

2011-04-15T08:01:22+00:00

Merge branch 'v5-devel'

2011-03-31T15:08:01+00:00

Conflicts:
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
	runtime/msg.c
	runtime/rsyslog.h
	template.c

did mapping of data items to database table columns

2011-03-29T09:50:32+00:00

to facilitate testing

sm_cust_bindcdr: custom date parsing added

2011-03-28T14:09:07+00:00