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-03-14	4	-38/+60
\|\ \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| *	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-14	4	-38/+60
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c runtime/queue.c runtime/queue.h
\| \| *	changed statsobj interface and added better doc	Rainer Gerhards	2012-03-14	4	-38/+60
\| \| \|
* \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-03-12	7	-5/+74
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c
\| * \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-03-12	3	-2/+11
\| \|\\|
\| \| *	bugfix: stopped DA queue was never processed after a restart	Rainer Gerhards	2012-03-12	3	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \|	...due to a regression from statistics module.
\| * \|	added capability to use a local interface IP address as fromhost-ip for imuxsock	Rainer Gerhards	2012-03-06	2	-3/+57
\| \| \| \| \| \| \| \| \| \| \| \|	new config directives: $IMUXSockLocalIPIF
\| * \|	added configuration directives to customize queue light delay marks	Rainer Gerhards	2012-02-21	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	$MainMsgQueueLightDelayMark, $ActionQueueLightDelayMark; both specify number of messages starting at which a delay happens.
\| * \|	stats: added unique (and friendly) name for ruleset queues	Rainer Gerhards	2012-01-31	1	-1/+4
\| \| \|
\| * \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-01-30	3	-16/+19
\| \|\\|
* \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-03-01	3	-16/+19
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/imklog/imklog.c plugins/imklog/imklog.h
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-27	3	-16/+19
\| \|\ \
\| \| * \|	bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵	Rainer Gerhards	2012-01-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configured
\| \| * \|	relicense unlimited_select.h under ASL 2.0	Rainer Gerhards	2012-01-26	1	-15/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after receiving permission from Red Hat legal (given in email from Tomas Heinrich)
\| \| * \|	increased max config file line size to 64k	Rainer Gerhards	2012-01-24	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now also emit an error message if even 64k is not enough (not doing so previously may rightfully be considered as a bug)
* \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2012-01-16	67	-1036/+912
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imtcp/imtcp.c
\| * \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-01-16	67	-1036/+912
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/impstats/impstats.c
\| \| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-16	65	-1001/+882
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
\| \| \| *	license changes	Rainer Gerhards	2012-01-16	45	-704/+617
\| \| \| \|
\| \| \| *	runtime license change	Rainer Gerhards	2012-01-16	20	-297/+265
\| \| \| \|
\| \| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-14	2	-35/+30
\| \| \|\\|
\| \| \| *	license change	Rainer Gerhards	2012-01-14	2	-35/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	after careful consideration of affected code
\| * \| \|	Merge branch 'v5-stable' into v5-stable-newstats	Rainer Gerhards	2012-01-09	1	-5/+5
\| \|\\| \|
* \| \| \|	part of merge, but forgot to add to merge set	Rainer Gerhards	2012-01-10	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'v4-stable-tmp' into v5-devel-tmp	Rainer Gerhards	2012-01-10	1	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: dirty.h tools/syslogd.c
\| * \ \ \	Merge branch 'tmp' into v4-stable-tmp	Rainer Gerhards	2012-01-10	1	-1/+5
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
\| \| * \| \|	added $SpaceLFOnReceive config directive	Tomas Heinrich	2012-01-10	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-01-09	1	-5/+5
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	bugfix: instabilities when using RFC5424 header fields	Kaiwang Chen	2012-01-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \| \|	bugfix: stats counter were not properly initialized on creation	Rainer Gerhards	2011-12-20	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2011-12-20	1	-0/+2
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c
\| * \| \| \|	bugfix: stats counter were not properly initialized on creation	Rainer Gerhards	2011-12-20	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2011-12-19	1	-4/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| * \| \| \|	better performance for action stats & cleanup: removing debug prints	Rainer Gerhards	2011-12-19	1	-4/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2011-12-19	1	-3/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c
\| * \| \| \|	added instrumentation	Rainer Gerhards	2011-12-19	2	-1/+12
\| \|/ / /
\| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-12-01	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: action.c
\| \| * \|	Merge branch 'v3-stable' into v4-stable	Rainer Gerhards	2011-12-01	1	-1/+1
\| \| \|\ \
\| \| \| * \|	bugfix: cosmetic: proper constant used instead of number in open call	Tomas Heinrich	2011-12-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-10-27	1	-2/+6
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \|	bugfix: potential abort after reading invalid X.509 certificate	Tomas Heinrich	2011-10-27	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| * \| \|	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-11	1	-1/+1
\| \| \|\ \ \
\| \| \| * \| \|	Added MsgDup bugfix from v5-stable into v4-stable branch	Andre Lorbach	2011-08-11	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-beta	Rainer Gerhards	2011-08-09	1	-1/+1
\| \| \|\\| \| \|
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-05	1	-7/+7
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \| \|	issue a warning message for old-style dynafile action	Rainer Gerhards	2011-07-11	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-07-11	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
* \| \| \| \| \| \| \|	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	2	-5/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	new stats counter "discarded" for queue object	Rainer Gerhards	2011-12-16	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tells how many messages have been discarded due to queue full condition.