rsyslog.git/tools, branch v5.7.3

Merge branch 'v4-devel' into v5-devel

2010-12-17T11:39:59+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	doc/manual.html
	plugins/imudp/imudp.c
	runtime/msg.h
	tools/syslogd.c

Merge branch 'v5-stable' into v5-devel

2010-12-17T10:46:06+00:00

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

added $LocalHostName config directive & some bugfixing

2010-12-16T14:29:20+00:00

- added $LocalHostName config directive
- bugfix: local hostname was pulled too-early, so that some config
  directives (namely FQDN settings) did not have any effect

Merge branch 'v4-stable' into v5-stable

2010-12-16T12:59:16+00:00

Conflicts:
	ChangeLog
	runtime/parser.c
	runtime/queue.c
	runtime/wtp.c
	template.c
	threads.c
	tools/syslogd.c

fixed cosmetic nit (as a result of clang static code analyzer run)

2010-12-16T12:41:18+00:00

cleanup of cosmetic nit (result of clang static code analyser run)

2010-12-16T12:40:23+00:00

Merge branch 'v4-stable' into v4-devel

2010-12-16T12:00:27+00:00

Conflicts:
	runtime/parser.c

some cleanup based on clang static analyzer results

2010-12-16T11:57:55+00:00

bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported

2010-12-02T06:28:04+00:00

also cleaned up some minor things

typo fix (thanks to Björn Påhlsson for finding it!)

2010-11-30T14:48:48+00:00

Signed-off-by: Rainer Gerhards