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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'beta'	Rainer Gerhards	2012-07-24	1	-0/+49
\|\
\| *	Merge branch 'v5-stable' into beta	Rainer Gerhards	2012-07-24	1	-3/+5
\| \|\
\| * \|	debug log: cleaned up & streamlined queue param output	Rainer Gerhards	2012-07-05	1	-20/+43
\| * \|	debug log: emit (some) action queue parameters to debug log	Rainer Gerhards	2012-07-05	1	-0/+26
* \| \|	Merge branch 'v5-stable'	Rainer Gerhards	2012-07-24	1	-3/+5
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	bugfix: DA queue could cause abort	Rainer Gerhards	2012-07-24	1	-3/+5
* \| \|	Merge branch 'beta'	Rainer Gerhards	2012-06-01	1	-10/+16
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge branch 'v5-beta' into beta	Rainer Gerhards	2012-06-01	1	-10/+16
\| \|\ \
\| \| * \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-06-01	1	-10/+16
\| \| \|\\|
\| \| \| *	some better code to handle queue congestion	Rainer Gerhards	2012-06-01	1	-10/+15
\| \| * \|	bugfix: disk queue was not persisted on shutdown, regression of fix to	Rainer Gerhards	2012-05-10	1	-11/+5
\| \| * \|	Merge branch 'v5-stable' into v5-beta	Rainer Gerhards	2012-05-03	1	-7/+47
\| \| \|\ \
\| \| * \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-04-07	1	-4/+8
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-14	1	-3/+2
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-12	1	-0/+9
\| \| \|\ \ \ \ \
* \| \| \| \| \| \| \|	added --enable-debugless configure option for very high demanding environments	Rainer Gerhards	2012-05-29	1	-6/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-05-10	1	-11/+5
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	bugfix: disk queue was not persisted on shutdown, regression of fix to	Rainer Gerhards	2012-05-10	1	-11/+5
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-05-03	1	-6/+47
\|\\| \| \| \| \|
\| * \| \| \| \|	bugfix: rsyslog did not terminate when delayable inputs were blocked	Rainer Gerhards	2012-05-03	1	-5/+42
\| * \| \| \| \|	bugfix: inside queue.c, some thread cancel states were not correctly reset.	Rainer Gerhards	2012-05-03	1	-5/+4
\| * \| \| \| \|	bugfix: active input in "light delay state" could block rsyslog termination	Rainer Gerhards	2012-04-27	1	-0/+4
* \| \| \| \| \|	Merge branch 'v5-stable-newstats'	Rainer Gerhards	2012-04-07	1	-0/+1
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-04-07	1	-4/+8
\| \|\\| \| \| \| \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-14	1	-3/+2
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-12	1	-1/+8
\| \|\ \ \ \
\| * \| \| \| \|	added configuration directives to customize queue light delay marks	Rainer Gerhards	2012-02-21	1	-0/+1
\| * \| \| \| \|	added instrumentation	Rainer Gerhards	2011-12-19	1	-1/+10
* \| \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-04-07	1	-4/+8
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	bugfix: segfault on startup if $actionqueuefilename was missing for disk queu...	Tomas Heinrich	2012-04-05	1	-1/+2
\| * \| \| \| \|	bugfix: segfault if disk-queue was started up with old queue file	Tomas Heinrich	2012-04-05	1	-3/+6
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	added "date-unixtimestamp" property replacer option to format as a unix times...	Rainer Gerhards	2012-03-29	1	-1/+0
* \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-17	1	-3/+2
\|\\| \| \| \|
\| * \| \| \|	changed statsobj interface and added better doc	Rainer Gerhards	2012-03-14	1	-3/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-12	1	-0/+8
\|\\| \| \|
\| * \| \|	bugfix: stopped DA queue was never processed after a restart	Rainer Gerhards	2012-03-12	1	-1/+8
\| \|/ /
* \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-12-19	1	-0/+9
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	experimental: added first stats counter to action object	Rainer Gerhards	2011-12-16	1	-1/+1
\| * \|	more work on queue statistics counter	Rainer Gerhards	2011-12-16	1	-4/+8
\| * \|	new stats counter "discarded" for queue object	Rainer Gerhards	2011-12-16	1	-0/+5
\| * \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-18	1	-0/+9
\| \|\\|
* \| \|	Merge branch 'beta'	Andre Lorbach	2011-08-18	1	-1/+8
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	removed debug code from action.c and runtime/queue.c after testing	Andre Lorbach	2011-08-18	1	-4/+0
\| * \|	bugfix: fixed incorrect state handling for Discard Action (transactions)	Andre Lorbach	2011-08-18	1	-0/+13
* \| \|	milestone: queue-params are properly initialized for action queues	Rainer Gerhards	2011-08-01	1	-0/+34
* \| \|	milestone: generic action parameters parsed via new config system	Rainer Gerhards	2011-08-01	1	-1/+1
* \| \|	milestone: queue object now has a param handler for new conf interface	Rainer Gerhards	2011-07-22	1	-39/+168
\| \|/ \|/\|
* \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-06-21	1	-4/+8
\|\\|
\| *	bugfix: mutex was invalidly left unlocked during action processingv5.8.2	Rainer Gerhards	2011-06-21	1	-4/+8
* \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-05-11	1	-1/+5
\|\\|