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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-03-01	1	-2/+2
\|\
\| *	bugfix: imklog invalidly computed facility and severity	Rainer Gerhards	2012-03-01	1	-2/+2
\| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313
* \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-02-03	1	-16/+14
\|\\|
\| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-02-03	1	-16/+14
\| \|\
\| \| *	ommysql: put under ASL 2.0	Rainer Gerhards	2012-02-03	1	-16/+14
\| \| \| \| \| \| \| \| \| \| \| \|	after getting OK via email from contributor Ariel P. (2012-02-02 22:06 CET)
* \| \|	omgssapi: made recompile again	Rainer Gerhards	2012-02-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	but this version seems to have a problem, a fix as part of a rewrite is underway. Just wanted to keep things in the same state as before the interface change.
* \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-27	3	-31/+35
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog plugins/omprog/omprog.c runtime/rsyslog.h
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-27	3	-31/+35
\| \|\\|
\| \| *	bugfix: omprog made rsyslog abort on startup if not binary to execute was ↵	Rainer Gerhards	2012-01-27	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	configured
\| \| *	licensing change	Rainer Gerhards	2012-01-21	2	-31/+29
\| \| \|
* \| \|	undoing v6.1 config scoping interface, part II (now finished)	Rainer Gerhards	2012-01-19	15	-65/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This concludes the removal of the new scoping interface, at least as far as pre v6-plugins are affected. Full code cleanup will happen in the v6.3 branch.
* \| \|	undoing v6.1 config scoping interface, part I	Rainer Gerhards	2012-01-18	13	-92/+92
\| \| \| \| \| \| \| \| \| \| \| \|	The most common files are now changed, more needs to be done.
* \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-18	1	-17/+16
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
\| * \|	licensing update	Rainer Gerhards	2012-01-16	1	-17/+16
\| \| \|
* \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-14	17	-276/+240
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imtcp/imtcp.c
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2012-01-14	16	-252/+226
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
\| \| *	more files moved to ASL 2.0	Rainer Gerhards	2012-01-12	4	-66/+58
\| \| \|
\| \| *	relicense parts under ASL 2.0	Rainer Gerhards	2012-01-11	12	-186/+168
\| \| \| \| \| \| \| \| \| \| \| \|	after carful check for copyright holder
\| * \|	relicense to ASL 2.0	Rainer Gerhards	2012-01-11	1	-24/+14
\| \| \|
* \| \|	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-09	1	-2/+5
\|\\| \|
\| * \|	bugfix: imuxsock did truncate part of received message if it did not contain ↵	Rainer Gerhards	2011-12-20	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
* \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-12-16	1	-3/+1
\|\\| \|
\| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-12-16	1	-3/+1
\| \|\\|
\| \| *	bugfix: potential fatal abort in omgssapi	Tomas Heinrich	2011-12-16	1	-3/+1
\| \| \|
\| \| *	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-20	1	-5/+0
\| \| \|\
\| \| * \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-05-09	2	-3/+13
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c
* \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-10-13	1	-2/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \|	bugfix: imfile did invalid system call under some circumstances	Rainer Gerhards	2011-10-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
* \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-09-26	1	-5/+10
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \|	bugfix: imuxsock did no longer ignore message-provided timestamp,	Rainer Gerhards	2011-09-07	1	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if so configured (the default). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281
* \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-08-31	1	-0/+1
\|\\| \| \| \|
\| * \| \| \|	bugfix: mark message processing did not work correctly	Rainer Gerhards	2011-08-31	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-05	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \|	doc: cleanup of copy-and-paste error in comment	Rainer Gerhards	2011-07-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	thanks to darix for alerting me
* \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-07-06	1	-9/+14
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog doc/manual.html
\| * \| \| \|	reduced sporadic failures during make check	Rainer Gerhards	2011-06-30	1	-9/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backport from v6
* \| \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-05-20	4	-5/+435
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c
\| * \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-05-20	1	-5/+0
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	cleanup: removed useless & undocumented config directive from imrelp	Rainer Gerhards	2011-05-20	1	-5/+0
\| \| \| \|/ \| \| \|/\|
\| * \| \|	omlibdbi: added necessary include	Rainer Gerhards	2011-05-12	1	-0/+1
\| \| \| \|
\| * \| \|	mmsnmptrapd: removed unnecessary includes	Rainer Gerhards	2011-05-12	1	-3/+0
\| \| \| \|
\| * \| \|	undo accidental removal of a component	Rainer Gerhards	2011-05-10	1	-0/+6
\| \| \| \|
\| * \| \|	mmsnmptrapd: added doc & mentioned in ChangeLog	Rainer Gerhards	2011-05-10	1	-6/+0
\| \| \| \|
\| * \| \|	cosmetic cleanup	Rainer Gerhards	2011-05-09	1	-2/+0
\| \| \| \|
\| * \| \|	mmsnmptrapd: added capability to specify severity mapping	Rainer Gerhards	2011-05-09	1	-2/+154
\| \| \| \|
\| * \| \|	mmsnmptrap: added TAG processing	Rainer Gerhards	2011-05-06	1	-1/+77
\| \| \| \|
\| * \| \|	added skeleton for mmsnmptrapd	Rainer Gerhards	2011-05-05	2	-0/+215
\| \| \| \|
* \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-05-09	1	-2/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tools/omfwd.c
\| * \| \|	bugfix: rate-limiting inside imuxsock did not work 100% correct	Rainer Gerhards	2011-04-27	1	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reason was that a global config variable was invalidly accessed where a listener variable should have been used. Also performance-improved the case when rate limiting is turned off (this is a very unintrusive change, thus done directly to the stable version).
* \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-04-15	3	-5/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/impstats/impstats.c