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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v4-devel'	Rainer Gerhards	2010-04-21	3	-0/+7
\|\
\| *	bugfix: some race condition in testbench on Solaris/Sparc	Super-User	2010-04-21	3	-0/+7
\| \|
* \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-20	5	-8/+167
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imsolaris/imsolaris.c tests/Makefile.am
\| *	saved old copy of Java DiagTalker tool	Rainer Gerhards	2010-04-20	2	-0/+3
\| \|
\| *	testbench improvement: Java is no longer needed for testing tool creation	Rainer Gerhards	2010-04-20	3	-8/+164
\| \|
* \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-04-19	5	-23/+56
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html runtime/debug.c runtime/rsyslog.h tests/Makefile.am tests/diag.sh tests/nettester.c tools/syslogd.c
\| *	some platforms seem to need time.h inside msleep.c	Peter Bray	2010-04-19	1	-0/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| *	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-04-12	6	-10/+14
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| *	solving a number of minor (but annoying) issues in the build system	Rainer Gerhards	2010-04-12	6	-9/+10
\| \| \|
\| \| *	added new configure option that permits to disable and enable an extended ↵	Rainer Gerhards	2010-04-12	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|	testbench
\| \| *	improvded testbench: added test with truly random data received via syslog ↵	Rainer Gerhards	2010-04-01	6	-36/+281
\| \| \| \| \| \| \| \| \| \| \| \|	to test robustness
\| \| *	temporary bugfix replaced by permanent one for...	Rainer Gerhards	2010-03-31	1	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...message-induced off-by-one error (potential segfault) (see 4.6.2) The analysis has been completed and a better fix been crafted and integrated.
\| * \|	bugfix/testbench: nettester did not work reliably under Solaris	Rainer Gerhards	2010-04-12	1	-21/+49
\| \| \|
\| * \|	adopted rsf_getenv.sh test case to new tcpflood calling conventions	Rainer Gerhards	2010-04-12	1	-1/+1
\| \| \|
\| * \|	Merge branch 'v4-stable-solaris' into v4-devel	Rainer Gerhards	2010-04-12	67	-84/+1662
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tools/omfile.c tools/syslogd.c
\| * \ \	Merge branch 'v4-beta' into v4-devel	Rainer Gerhards	2009-11-20	2	-0/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac doc/manual.html
* \| \| \| \|	bugfix: netstream ptcp support class was not correctly build on systems ↵	Rainer Gerhards	2010-04-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	without epoll() support
* \| \| \| \|	preparing for 5.5.3 releasev5.5.3	Rainer Gerhards	2010-04-09	5	-9/+10
\| \| \| \| \|
* \| \| \| \|	Merge branch 'beta' into master	Rainer Gerhards	2010-04-09	65	-86/+1524
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c runtime/stream.h tests/Makefile.am tests/diag.sh tools/omfile.c
\| * \ \ \ \	Merge branch 'v4-stable-solaris' into beta	Rainer Gerhards	2010-04-09	11	-60/+376
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/Makefile.am runtime/rsyslog.c tests/nettester.c tools/syslogd.c
\| \| * \| \| \|	enhanced nettester tool so that it re-uses it's callers environment	Rainer Gerhards	2010-04-07	9	-53/+297
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this enables us to work with the "usual" environment tweaks (for debugging and other purposes), without the need for any special handling in nettester itself
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-stable-solaris	Rainer Gerhards	2010-03-29	4	-5/+9
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-stable-solaris	Rainer Gerhards	2010-03-26	1	-2/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \| \|	added missing header	Rainer Gerhards	2010-03-25	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'v4-stable' into v4-stable-solaris	Rainer Gerhards	2010-03-25	19	-25/+72
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \| \| \|	testbench improved to run on Solaris	Rainer Gerhards	2010-03-25	2	-2/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	manytcp test tool must tell OS to provide enough file handles	Rainer Gerhards	2010-03-25	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On some platforms, the default is too low to carry out all test cases
\| \| * \| \| \| \| \|	replaced sleep in test suite by a small self-crafted tool	Rainer Gerhards	2010-03-25	3	-5/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	subsecond sleep did not work on all platforms
\| \| * \| \| \| \| \|	added some diagnostics info to startup	Rainer Gerhards	2010-03-23	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-03-29	4	-5/+9
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \|	bugfix: testbench failed when not executed in UTC+1 timezone	Rainer Gerhards	2010-03-29	4	-5/+9
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	accidently, the time zone information was kept inside some to-be-checked-for responses
\| * \| \| \| \| \|	adjusting testbench to new (v4 enhanced) testing tools	Rainer Gerhards	2010-03-29	4	-6/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-03-29	52	-64/+1182
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/debug.c runtime/stream.c tests/Makefile.am tests/diskqueue.sh tests/nettester.c tools/omfile.c
\| \| * \| \| \| \|	preparing for 4.6.2v4.6.2	Rainer Gerhards	2010-03-26	1	-2/+1
\| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	disable testcases affected by temporary bugfix in commit ↵	Rainer Gerhards	2010-03-25	2	-9/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a3e48b697fa664110567fcd0027d24ea5a239041 ... so that the testbench continues to work
\| \| * \| \| \|	new feature: $OMFileAsyncWriting directive added	Rainer Gerhards	2010-03-25	17	-16/+59
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it permits to specifiy if asynchronous writing should be done or not
\| \| * \| \|	adding testcase files missing in git	Rainer Gerhards	2010-03-23	2	-0/+102
\| \| \| \| \|
\| \| * \| \|	valgrand accidently left enabled in diag.sh with the last commit	Rainer Gerhards	2010-03-22	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	bugfix(minor): BSD_SO_COMPAT query function had some global vars not ↵	Rainer Gerhards	2010-03-22	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	properly initialized. However, in practice the loader initializes them with zero, the desired value, so there were no actual issue in almost all cases.
\| \| * \| \|	added one more test case for dynafile cache	Rainer Gerhards	2010-03-22	3	-1/+55
\| \| \| \| \|
\| \| * \| \|	cleanup of debug message in testbench	Rainer Gerhards	2010-03-22	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	added testcase showcasing problems when dynafile can not be opened	Rainer Gerhards	2010-03-22	3	-16/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	note that so far no patch is provided. This has not yet been made part of "make check"
\| \| * \| \|	added some more tests for severely ill-formed snare messages	Rainer Gerhards	2010-03-21	7	-6/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also improved nettester testbench tool a bit
\| \| * \| \|	added parser test cases to testbench	Rainer Gerhards	2010-03-19	4	-0/+26
\| \| \| \| \|
\| \| * \| \|	solved some race conditions in testbench	Rainer Gerhards	2010-03-19	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the test cases actually have some races, not the code to be tested
\| \| * \| \|	slight improvement to testing tools	Rainer Gerhards	2010-03-19	3	-9/+29
\| \| \| \| \|
\| \| * \| \|	fixed regression from previos (yet unrelease) $omfileFlushOnTXEnd fixtemp.4.6.1.10	Rainer Gerhards	2010-03-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous fix fixed an issue with on/off bying used in the exact wrong semantic. It corrected the situation, but failed to fix one spot where the wrong semantics were used. This is done with this commit. Note that this is NOT a bug seen in any released version.
\| \| * \| \|	added additional test case for async writer	Rainer Gerhards	2010-03-19	3	-0/+43
\| \| \| \| \|
\| \| * \| \|	some cleanup, some additional comments and a bit more debug output	Rainer Gerhards	2010-03-18	4	-17/+13
\| \| \| \| \|
\| \| * \| \|	added test for deadlock with dynafile writing and cache exhaustion	Rainer Gerhards	2010-03-17	3	-0/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that this introduces a test case that breaks the current code. This commit does NOT yet provide the necessary code patch. Thus "make check" does currently hang.