Rainer Gerhards d6da57ae03 Merge branch 'v5-stable-newstats' ...

Conflicts:
	action.c
	configure.ac
	doc/imuxsock.html
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
	runtime/glbl.h
	runtime/net.c
	runtime/ruleset.c
	tcpsrv.h
	tools/syslogd.c

2012-04-07 15:42:46 +02:00

..

impstats.c

Merge branch 'v5-stable-newstats'

2012-04-07 15:42:46 +02:00

Makefile.am

added module impstat to emit periodic statistics on rsyslog counters

2010-09-09 12:24:22 +02:00