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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-05-03	1	-1/+27
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	preparing for 5.8.11 releasev5.8.11	Rainer Gerhards	2012-05-03	1	-1/+1
\| \|
\| *	bugfix: ommysql did not properly init/exit the mysql runtime library	Rainer Gerhards	2012-05-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This could lead to segfaults. Triggering condition: multiple action instances using ommysql. Thanks to Tomas Heinrich for reporting this problem and providing an initial patch (which my solution is based on, I need to add more code to clean the mess up).
\| *	bugfix: rsyslog did not terminate when delayable inputs were blocked	Rainer Gerhards	2012-05-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	...due to unvailable sources. Fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=299 Thanks to Marcin M for bringing up this problem and Andre Lorbach for helping to reproduce and fix it.
\| *	bugfix: inside queue.c, some thread cancel states were not correctly reset.	Rainer Gerhards	2012-05-03	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	While this is a bug, we assume it did have no practical effect because the reset as it was done was set to the state the code actually had at this point. But better fix this...
\| *	bugfix: active input in "light delay state" could block rsyslog termination	Rainer Gerhards	2012-04-27	1	-0/+2
\| \| \| \| \| \| \| \|	at least for prolonged period of time...
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-19	1	-0/+2
\|\\|
\| *	doc: added last bugfix to ChangeLog	Rainer Gerhards	2012-04-19	1	-0/+2
\| \|
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-18	1	-0/+4
\|\\|
\| *	bugfix: assigned ruleset was lost when using disk queues	Rainer Gerhards	2012-04-18	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages stored inside the disk queue.
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-12	1	-0/+5
\|\\| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| *	doc: credits update for last bugfix	Rainer Gerhards	2012-04-11	1	-1/+2
\| \|
\| *	bugfix: hostname was not requeried on HUP	Rainer Gerhards	2012-04-11	1	-0/+4
\| \| \| \| \| \| \| \|	Thanks to Marius Tomaschewski for reporting this bug.
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-04-07	1	-1/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	preparing for 5.8.10v5.8.10	Rainer Gerhards	2012-04-07	1	-1/+1
\| \|
\| *	bugfix: segfault on startup if $actionqueuefilename was missing for disk ↵	Tomas Heinrich	2012-04-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	queue config Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| *	bugfix: segfault if disk-queue was started up with old queue file	Tomas Heinrich	2012-04-05	1	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-17	1	-1/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	bugfix: memory leak in array passing output module mode	Rainer Gerhards	2012-03-17	1	-0/+3
\| \|
\| *	preparing for 5.8.9v5.8.9	Rainer Gerhards	2012-03-15	1	-1/+1
\| \|
\| *	added tool to recover disk queue if .qi file is missing (recover_qi.pl)	Kaiwang Chen	2012-03-15	1	-0/+2
\| \|
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-14	1	-0/+3
\|\\|
\| *	changed statsobj interface and added better doc	Rainer Gerhards	2012-03-14	1	-0/+3
\| \|
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-12	1	-1/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	bugfix: stopped DA queue was never processed after a restart	Rainer Gerhards	2012-03-12	1	-0/+4
\| \| \| \| \| \| \| \|	...due to a regression from statistics module.
\| *	preparing for 5.8.8v5.8.8	Rainer Gerhards	2012-03-05	1	-1/+1
\| \|
* \|	mentioned imported bugfix in ChangeLog	Rainer Gerhards	2012-03-01	1	-0/+2
\| \|
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-01	1	-0/+2
\|\\|
\| *	bugfix: imklog invalidly computed facility and severity	Rainer Gerhards	2012-03-01	1	-0/+2
\| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-27	1	-0/+13
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
\| *	added merged v4 bugfix info to changelog	Rainer Gerhards	2012-01-27	1	-0/+4
\| \|
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-27	1	-0/+5
\| \|\
\| \| *	bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵	Rainer Gerhards	2012-01-27	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	configured
\| \| *	increased max config file line size to 64k	Rainer Gerhards	2012-01-24	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
\| * \|	mentioning license change in ChangeLog	Rainer Gerhards	2012-01-21	1	-0/+1
\| \| \|
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-21	1	-0/+1
\| \|\\|
\| \| *	license docs were not properly redistributed	Rainer Gerhards	2012-01-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	thanks to Tomas Heinrich for alerting me.
* \| \|	mentioning license change in ChangeLog	Rainer Gerhards	2012-01-21	1	-0/+1
\| \| \|
* \| \|	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|	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/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
\| * \|	preparing for 5.8.7v5.8.7	Rainer Gerhards	2012-01-17	1	-1/+3
\| \| \|
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-16	1	-0/+2
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/syslogd.c
\| \| *	FQDN hostname for multihomed host was not always set to the correct name	Tomas Heinrich	2012-01-16	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \|	final prep for 6.2.0v6.2.0	Rainer Gerhards	2012-01-09	1	-1/+1
\| \| \|
* \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-09	1	-0/+7
\|\\| \|
\| * \|	bugfix: instabilities when using RFC5424 header fields	Kaiwang Chen	2012-01-09	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \|	bugfix: stats counter were not properly initialized on creation	Rainer Gerhards	2011-12-20	1	-0/+1
\| \| \|
\| * \|	bugfix: imuxsock did truncate part of received message if it did not contain ↵	Rainer Gerhards	2011-12-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
* \| \|	removing $Begin, $End, $StrictScoping directives	Rainer Gerhards	2012-01-09	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-12-16	1	-1/+4
\|\\| \|