rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
*	undoing v6.1 config scoping interface, part II (now finished)	Rainer Gerhards	2012-01-19	1	-5/+5
\| \| \| \| \| \|	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.
*	Merge branch 'v5-stable' into v6-stable	Rainer Gerhards	2012-01-14	1	-24/+14
\|\ \| \| \| \| \| \| \| \|	Conflicts: plugins/imtcp/imtcp.c
\| *	relicense to ASL 2.0	Rainer Gerhards	2012-01-11	1	-24/+14
\| \|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-04-15	1	-0/+2
\|\\| \| \| \| \| \| \| \| \|	Conflicts: plugins/impstats/impstats.c
\| *	bugfix: doc for impstats had wrong config statements	Rainer Gerhards	2011-04-14	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem.
* \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-03-11	1	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
\| *	fixed small regression from gnutls fd leak fix	Rainer Gerhards	2011-03-06	1	-0/+1
\| \|
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-05	1	-4/+4
\|/ \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
*	improved statistics-gathering subsystem	Rainer Gerhards	2010-09-13	1	-12/+27
\| \| \| \| \| \| \| \|	... well, actually this is a first real implementation of this subsystem. I have added a counter registry, a way to access the countres (as readable string) and a way to define and maintem them. Also, module impstats has been updated to utilize the new system. Finally, I added some counters. I hope that this sets the baseline for useful future enhancements.
*	fixed small memory leak, corrected input name	Rainer Gerhards	2010-09-09	1	-1/+3
\|
*	added module impstat to emit periodic statistics on rsyslog counters	Rainer Gerhards	2010-09-09	2	-0/+217
	This is a very first and very rough and very featureless first shot at this functionality. It is assumed that we will enhance the stats system as a by-line while doing other development.