rsyslog - Modifications to rsyslog---see v3-stable-kaz branch

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-06-15	1	-0/+1
\|\
\| *	bugfix "$PreserveFQDN on" was not honored in some modules	Rainer Gerhards	2012-06-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	Thanks to bodik for reporting this bug. ---------------------------------------------
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-06-06	1	-0/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	add small delay (50ms) after sending shutdown message	Rainer Gerhards	2012-06-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	There seem to be cases where the shutdown message is otherwise not processed, not even on an idle system. Thanks to Marcin for bringing this problem up.
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-06-01	1	-2/+5
\|\\|
\| *	cosmetic: slightly improved debug output	Rainer Gerhards	2012-05-31	1	-2/+2
\| \|
\| *	bugfix: if debug message could end up in log file when forking	Tomas Heinrich	2012-05-29	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if rsyslog was set to auto-background (thus fork, the default) and debug mode to stdout was enabled, debug messages ended up in the first log file opened. Currently, stdout logging is completely disabled in forking mode (but writing to the debug log file is still possible). This is a change in behaviour, which is under review. If it causes problems to you, please let us know. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-05-10	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| *	cleanup: removing no longer needed macros	Rainer Gerhards	2012-05-04	1	-1/+1
\| \|
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-05-03	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	debug: slightly improved debug info for input module startup	Rainer Gerhards	2012-05-03	1	-0/+1
\| \|
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-12	1	-73/+97
\|\\| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| *	imuxsock: do not cache hostname	Rainer Gerhards	2012-04-12	1	-1/+1
\| \|
\| *	Allocate LocalDomain as new string	Marius Tomaschewski	2012-04-11	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LocalDomain points to "" or the domain in LocalHostName, allocate as new string before passing to SetLocalDomain or free will fail later. Signed-off-by: Marius Tomaschewski <mt@suse.com>
\| *	bugfix: hostname was not requeried on HUP	Rainer Gerhards	2012-04-11	1	-72/+93
\| \| \| \| \| \| \| \|	Thanks to Marius Tomaschewski for reporting this bug.
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-17	2	-1/+209
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	added tool to recover disk queue if .qi file is missing (recover_qi.pl)	Kaiwang Chen	2012-03-15	2	-1/+209
\| \|
* \|	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	3	-75/+75
\| \| \| \| \| \| \| \|	The most common files are now changed, more needs to be done.
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-18	1	-1/+21
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-16	1	-1/+21
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/syslogd.c
\| \| *	FQDN hostname for multihomed host was not always set to the correct name	Tomas Heinrich	2012-01-16	1	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-14	13	-194/+178
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imtcp/imtcp.c
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-14	13	-194/+178
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
\| \| *	more license analysis & change	Rainer Gerhards	2012-01-14	11	-178/+163
\| \| \|
\| \| *	rsyslog.conf.5 socket module example sb imuxsock	Jim Hill	2012-01-14	1	-1/+1
\| \| \|
\| \| *	relicense parts under ASL 2.0	Rainer Gerhards	2012-01-11	1	-15/+14
\| \| \| \| \| \| \| \| \| \| \| \|	after carful check for copyright holder
* \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-21	1	-2/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \|	minor: slightly improved error reporting when dynafile open fails	Rainer Gerhards	2011-10-20	1	-2/+3
\| \| \|
* \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-09-26	3	-10/+15
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \|	bugfix: omfile returns fatal error code for things that go really wrong	Rainer Gerhards	2011-09-26	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-09-22	2	-6/+12
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
\| \| *	bugfix: potential abort if ultra-large file io buffers are used and	Rainer Gerhards	2011-09-20	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
\| \| *	Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stable	Rainer Gerhards	2011-09-15	3	-31/+98
\| \| \|\
\| \| \| *	Merge branch 'v4-stable' into v4-beta	Rainer Gerhards	2011-08-30	1	-1/+1
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| \| * \	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-05	1	-7/+9
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| \| * \| \|	issue a warning message for old-style dynafile action	Rainer Gerhards	2011-07-11	1	-1/+8
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-07-11	2	-2/+12
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| \| * \ \ \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-09	1	-2/+2
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
\| \| * \| \| \| \| \|	typo fix	Andrew Stothard	2011-09-15	2	-2/+2
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	bugfix: rsyslogd -v always said 64 atomics were not present	mono_matsuko	2011-09-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-08-30	1	-3/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-08-30	1	-3/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog tools/syslogd.c
\| \| * \| \| \| \|	bugfix: off-by-one(two) bug in legacy syslog parser	Rainer Gerhards	2011-08-10	1	-1/+1
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
* \| \| \| \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-18	1	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \| \| \| \|	Added debug output into message parsers needed for bugtracking	Andre Lorbach	2011-08-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed version to 5.8.5-pre1
\| * \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-11	1	-7/+9
\| \|\\| \| \| \|
* \| \| \| \| \|	Merge branch 'v4-stable' into beta	Rainer Gerhards	2011-07-11	1	-7/+9
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	doc: updated rsyslog.conf man page with new syntaxes	Rainer Gerhards	2011-07-11	1	-7/+9
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-07-11	1	-1/+16
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| * \| \| \|	added warning message for old-style outchannel syntax	Rainer Gerhards	2011-07-11	1	-1/+8
\| \| \| \| \|