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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-01-16	14	-195/+199
\|\ \| \| \| \| \| \| \| \|	Conflicts: plugins/imtcp/imtcp.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 '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
* \| \|	omfwd refactor: even more simplification (small one ;))	Rainer Gerhards	2012-01-14	1	-2/+1
\| \| \|
* \| \|	omfwd license change to ASL 2.0	Rainer Gerhards	2012-01-14	1	-20/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after careful consideration of contributor history. David Lang gave permission to license under ASL 2.0, other patches have been replaced by refactored code.
* \| \|	omfwd refactor: simplification	Rainer Gerhards	2012-01-14	1	-9/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	at the same time, remove commits - 8c3ab2e26f1bae46ff34fc1d0a10a69c4db78127 - 009738a0ac6ba0dccf403f9e396095f44e4f9ac6
* \| \|	omfwd refactor: simplifying code	Rainer Gerhards	2012-01-14	1	-21/+9
\| \| \| \| \| \| \| \| \| \| \| \|	also remove code introduced by commit 6e97513eea1a6e282365eb01d972e0657cb36baa
* \| \|	Merge branch 'v4-stable-tmp' into v5-devel-tmp	Rainer Gerhards	2012-01-10	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: dirty.h tools/syslogd.c
\| * \ \	Merge branch 'tmp' into v4-stable-tmp	Rainer Gerhards	2012-01-10	1	-0/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
\| \| * \| \|	added $SpaceLFOnReceive config directive	Tomas Heinrich	2012-01-10	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \| \|	Merge branch 'tmp' into v4-stable-tmp	Rainer Gerhards	2012-01-10	1	-0/+3
\| \|\\| \| \| \| \| \|_\|/ \| \|/\| \|
\| \| * \|	added canned template for ultra-exact sysklogd file format	Tomas Heinrich	2012-01-10	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the point is that LF will be translated to SP Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-10-21	1	-2/+3
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| * \| \|	minor: slightly improved error reporting when dynafile open fails	Rainer Gerhards	2011-10-20	1	-2/+3
\| \| \| \|
* \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-09-26	1	-10/+13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
\| * \| \|	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
\| \| * \| \| \| \| \|	typo fix	Andrew Stothard	2011-09-15	2	-2/+2
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-09-07	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
\| * \| \| \| \| \|	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 v5-devel	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 v5-devel	Andre Lorbach	2011-08-16	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
* \| \| \| \| \|	added capability to emit config error location info for warnings	Rainer Gerhards	2011-08-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
* \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-05	1	-7/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \| \|	Merge branch 'v4-stable' into v5-stable	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 v5-devel	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
\| \| \| \| \|
\| * \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-11	1	-1/+9
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh
\| \| * \| \|	support for :omfile: forward compatibility directive	Rainer Gerhards	2011-07-11	1	-1/+9
\| \| \| \| \|
* \| \| \| \|	issue a warning if old omusrmsg action syntax is used	Rainer Gerhards	2011-07-06	1	-2/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-07-06	1	-1/+3
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog doc/manual.html
\| * \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-06	1	-1/+3
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \| \|	added support for the ":omusrmsg:" syntax in configuring user messages	Rainer Gerhards	2011-07-06	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-16	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \| \| \|	bugfix: problems in failover action handling	Rainer Gerhards	2011-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!)
\| * \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-05-09	1	-2/+2
\| \|\\| \| \|