rsyslog.git/tools, branch ommongodb

add uuid property to message object

2012-08-26T12:13:26+00:00

Merge branch 'v6-stable'

2012-08-25T10:19:56+00:00

Conflicts:
	ChangeLog
	configure.ac
	runtime/ruleset.c
	tools/syslogd.c

Merge branch 'v5-stable' into v6-stable

2012-08-25T09:55:41+00:00

Conflicts:
	ChangeLog
	action.c
	configure.ac
	doc/manual.html
	runtime/ruleset.c
	template.h
	threads.c
	tools/syslogd.c

Merge branch 'v5-stable' into v5-beta

2012-08-22T13:32:05+00:00

Conflicts:
	runtime/ruleset.c

changed TRUE/FALSE to RSTRUE/RSFALSE

2012-08-22T13:29:02+00:00

This is done to prevent name claches with libraries.

bugfix: multiple main queues with same queue file name were not detected

2012-08-22T12:30:12+00:00

This lead to queue file corruption. While the root cause is a config
error, it is a bug that this important and hard to find config error
was not detected by rsyslog.

Merge branch 'v5-stable' into beta

2012-08-20T10:37:39+00:00

bugfix: potential abort if output plugin logged message during shutdown

2012-08-01T08:14:37+00:00

note that none of the rsyslog-provided plugins does this
Thanks to bodik and Rohit Prasad for alerting us on this bug and
analyzing it.
fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347

Merge branch 'beta'

2012-06-29T13:51:46+00:00

Conflicts:
	ChangeLog
	runtime/rsyslog.h

Merge branch 'master-elasticsearch' into tmp

2012-06-29T13:45:39+00:00