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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-03-12	3	-1/+11
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/queue.c
\| * \| \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-12	3	-2/+11
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \| \| \|	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.
* \| \| \| \|	changes needed for libee 0.4.2	Rainer Gerhards	2012-02-28	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	bugfix: property $!all-json made rsyslog abort if no normalized data is ↵	Rainer Gerhards	2012-02-21	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	available
* \| \| \| \|	dns cache: working on invalid resolution bug, again	Rainer Gerhards	2012-02-09	3	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the proposed solution did not work out well...
* \| \| \| \|	dns cache: experimental fix for name resulution problem	Rainer Gerhards	2012-02-08	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	dns chache: added some more error instrumentation	Rainer Gerhards	2012-02-06	2	-31/+28
\| \| \| \| \|
* \| \| \| \|	cleanup: remove code for no-longer needed legacy conf functionality	Rainer Gerhards	2012-02-01	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	conf file: bufgix: legacy parsing of some filters did not work correctly	Rainer Gerhards	2012-02-01	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	bugfix: rsyslog aborted during startup if there is an error in loading an action	Rainer Gerhards	2012-01-27	3	-24/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and legacy configuration mode is used
* \| \| \| \|	Merge branch 'v6-stable'	Rainer Gerhards	2012-01-27	2	-16/+15
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h runtime/conf.c runtime/rsyslog.h
\| * \| \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-27	3	-17/+19
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.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)
* \| \| \| \| \|	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
\| \| \| \| \| \| \|