rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
*	milestone: added support for CEE-properties in property-based filters	Rainer Gerhards	2010-12-01	11	-33/+99
\|
*	milestone: ability to use normalized names in templates	Rainer Gerhards	2010-12-01	1	-0/+37
\|
*	milestone: template supports CEE output via %$!all-json%	Rainer Gerhards	2010-12-01	6	-6/+39
\|
*	mmnormalize loads & runs (basic testing done)	Rainer Gerhards	2010-12-01	5	-6/+22
\|
*	milestone: added mmnormalize (compiles, but untested)	Rainer Gerhards	2010-12-01	7	-1/+306
\|
*	Merge branch 'v5-devel'v6.1.1	Rainer Gerhards	2010-11-30	2	-7/+11
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| *	bumped version to 5.7.2v5.7.2	Rainer Gerhards	2010-11-30	3	-3/+7
\| \|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-11-25	17	-171/+338
\|\\| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| *	Merge branch 'v5-beta' into v5-devel	Rainer Gerhards	2010-11-25	17	-139/+302
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h
\| \| *	bugfix: replacements for atomic operations for non-int sized types had problems.	Rainer Gerhards	2010-11-25	8	-126/+201
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At least one instance of that problem could potentially lead to abort (inside omfile).
\| \| *	bugfix: atomic increment for msg object may not work correct on all platforms.	Chris Metcalf	2010-11-25	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| *	forgot to add to ChangeLog	Rainer Gerhards	2010-11-25	1	-0/+4
\| \| \|
\| \| *	streamlined epoll_create() code a little bit	Rainer Gerhards	2010-11-25	1	-2/+5
\| \| \|
\| \| *	fixed compile problem in imptcp if no epoll_create1() is present	David Hill	2010-11-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| *	Merge branch 'v5.6.0a' into v5-stable	Rainer Gerhards	2010-11-25	3	-3/+33
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| \| \| *	imfile improvements	Rainer Gerhards	2010-10-27	4	-4/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
\| \| * \|	final cleanup for 5.6.1v5.6.1	Rainer Gerhards	2010-11-24	1	-1/+1
\| \| \| \|
\| \| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-11-24	3	-1/+32
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| \| \| * \	Merge branch 'v3-stable' into v4-stable	Rainer Gerhards	2010-11-24	3	-1/+28
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| \| \| \| * \|	bugfix(important): problem in TLS handling could cause rsyslog to loopv3.22.3	Rainer Gerhards	2010-11-24	3	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... in a tight loop, effectively disabling functionality and bearing the risk of unresponsiveness of the whole system. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
\| \| * \| \| \|	bugfix: testbench failed if imptcp was not enabled	Rainer Gerhards	2010-11-05	2	-3/+8
\| \| \| \| \| \|
\| \| * \| \| \|	provide clear error message if platform does not support imptcp	Rainer Gerhards	2010-11-05	1	-0/+7
\| \| \| \| \| \|
\| \| * \| \| \|	permitted imptcp to work on systems which support epoll(), but not ↵	Rainer Gerhards	2010-11-05	2	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	epoll_create(). Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204 Thanks to Nicholas Brink for reporting this problem.
\| \| * \| \| \|	bugfix: segfault when an empty template was used	Rainer Gerhards	2010-11-05	2	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206 Thanks to David Hill for alerting us.
\| \| * \| \| \|	bugfix: compile failed with --enable-unlimited-select	varmojfekoj	2010-11-05	3	-1/+5
\| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-20	3	-3/+30
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imfile/imfile.c
\| * \| \| \|	Merge branch 'v4-devel' into v5-devel	root	2010-10-20	3	-3/+30
\| \|\ \ \ \
\| \| * \| \| \|	imfile improvements	Rainer Gerhards	2010-10-24	3	-18/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-10-19	8	-372/+84
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/cfsysline.c tools/ompipe.c
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-10-22	1	-2/+2
\| \| \|\ \ \ \
* \| \| \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-22	14	-376/+126
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2010-10-22	14	-376/+126
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \| \| \| \|	fixing a potentially uninitialized variablev5.6.0	Rainer Gerhards	2010-10-19	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-10-19	8	-372/+84
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
\| \| \| * \| \| \|	fixing some compile problems on FreeBSD	Rainer Gerhards	2010-10-19	10	-376/+87
\| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| * \| \| \|	fixed testbench compile problem on Solaris	Rainer Gerhards	2010-10-19	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	yet another forgotten testbench file	Rainer Gerhards	2010-10-22	1	-0/+12
\| \| \| \| \| \|
\| \| * \| \| \|	added forgotten testbench file	Rainer Gerhards	2010-10-22	1	-0/+13
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-10-22	1	-2/+2
\| \| \|\\| \| \|
\| \| \| * \| \|	better error messages in testbench	Rainer Gerhards	2010-10-22	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	preparing for 5.6.0	Rainer Gerhards	2010-10-22	3	-2/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-15	10	-19/+71
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \| \|	Merge branch 'v5-beta' into v5-devel	Rainer Gerhards	2010-10-15	4	-10/+32
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile.am plugins/imfile/imfile.c runtime/stream.c tests/tcpflood.c
\| \| * \| \| \|	solved minor compile problem (caused by merge)	Rainer Gerhards	2010-10-15	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'v4-devel' into v5-beta	Rainer Gerhards	2010-10-15	26	-76/+1539
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile.am tests/tcpflood.c
\| \| \| * \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-10-15	4	-10/+35
\| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/stream.c
\| \| \| \| * \|	fixed incomplete merge	Rainer Gerhards	2010-10-15	1	-0/+1
\| \| \| \| \| \|
\| \| \| \| * \|	imfile: bugfixes in regard to large files (> 2GB)	Rainer Gerhards	2010-10-15	3	-10/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- bugfix: a couple of problems that imfile had on some platforms, namely Ubuntu (not their fault, but occured there) - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!)
\| \| \| \| * \|	minor doc fix: updated tls doc to match new gnutls toolset	Tom Bergfeld	2010-09-08	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \| \| \|	imfile: bug fixes	Rainer Gerhards	2010-10-15	3	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	either one or two bugs fixed ;) Definitely a problem where no state file is written when working with relative pathes. Also, some problems with offsets should be fixed for very large files. However, I could not yet experimentally show the issue so it probably needs more verification.