rsyslog - Modifications to rsyslog---see v3-stable-kaz branch

	Commit message (Collapse)	Author	Age	Files	Lines
*	refactor: removing dead apc code	Rainer Gerhards	2012-01-19	5	-465/+0
\| \| \| \| \| \|	another concept that did not prove valuable enough to be kept active. For the last couple of releases, the dead code was kept inside the project as we thought we could probably reuse it. Doesn't look so...
*	refactor: remove very old sync.[ch] system for "abstracting" mutex access	Rainer Gerhards	2012-01-19	3	-105/+0
\| \| \| \|	This was a bad idea that never was used much.
*	refactor: removing v6.1 scoping code	Rainer Gerhards	2012-01-19	2	-140/+12
\|
*	v6.1/2 scoping support removed from plugins	Rainer Gerhards	2012-01-19	1	-34/+3
\|
*	Merge branch 'v6-stable'	Rainer Gerhards	2012-01-19	4	-16/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/conf.c runtime/modules.c runtime/modules.h
\| *	removing the newScope/resumeScope macro interfaces	Rainer Gerhards	2012-01-19	4	-16/+4
\| \| \| \| \| \| \| \|	to make using pre-v6-plugins even easier
* \|	Merge branch 'v6-stable-noscoping' into master	Rainer Gerhards	2012-01-19	8	-85/+76
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
\| *	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	7	-37/+28
\| \| \| \| \| \| \| \|	The most common files are now changed, more needs to be done.
\| *	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-18	67	-1036/+912
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
* \| \	Merge branch 'v5-devel' into master	Rainer Gerhards	2012-01-18	2	-1/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
\| * \ \	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 '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
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'v5-stable' into master	Rainer Gerhards	2012-01-18	53	-812/+716
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.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 'v6-stable'	Rainer Gerhards	2012-01-09	1	-5/+5
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-09	2	-5/+7
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	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 'beta'	Rainer Gerhards	2012-01-09	1	-0/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog doc/v6compatibility.html
\| * \| \| \| \| \|	removing $Begin, $End, $StrictScoping directives	Rainer Gerhards	2012-01-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* \| \| \| \| \| \|	Merge branch 'v5-devel'	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-devel'	Rainer Gerhards	2011-12-19	3	-4/+11
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c plugins/imudp/imudp.c
\| * \| \| \| \| \|	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
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	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.
* \| \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-12-16	2	-38/+53
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
\| * \| \| \| \|	enhanced module loader to not rely on PATH_MAX	Rainer Gerhards	2011-12-16	1	-34/+46
\| \| \| \| \| \|
\| * \| \| \| \|	one further change to support gnutls without libgcrypt	Rainer Gerhards	2011-10-21	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'beta'	Rainer Gerhards	2011-12-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-12-01	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	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 'beta'	Rainer Gerhards	2011-10-27	2	-4/+8
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html