rsyslog.git/plugins/omhdfs, branch master

bugfix: omhdfs did no longer compile

2012-07-11T13:26:23+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.

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-03-14T11:49:12+00:00

Conflicts:
	tests/diag.sh

Merge branch 'v5-devel'

2011-03-11T12:06:29+00:00

Conflicts:
	ChangeLog
	plugins/omhdfs/omhdfs.c

omhdfs: added some info on Java environment settings

2011-03-11T11:10:38+00:00

Merge branch 'v5-beta'

2011-03-11T09:24:58+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omlibdbi/omlibdbi.c
	tests/Makefile.am
	tests/diag.sh