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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-27	1	-2/+6
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \|	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
\| * \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-21	2	-1/+2
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-21	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/rsyslog_recording_pri.html
\| * \| \| \| \| \| \| \| \|	bugfix (kind of): removed numerical part from pri-text	Rainer Gerhards	2011-10-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see v6 compatibility document for reasons
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-10-21	4	-4/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-10-21	3	-3/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| \| * \| \| \| \| \| \| \|	bugfix: missing whitespace after property-based filter was not detected	Rainer Gerhards	2011-10-21	2	-1/+2
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	bugfix: $OMFileFlushInterval period was doubled - now using correct value	Rainer Gerhards	2011-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	removed dependency on gcrypt for recently-enough GnuTLS	Rainer Gerhards	2011-10-17	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
\| * \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-10-17	2	-11/+51
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog