rsyslog.git/tools, branch v4.7.5 rsyslog development for Lumberjack - various unofficial and potentially rebased branches Merge branch 'v4-stable' into v4-beta 2011-08-30T12:53:31+00:00 Rainer Gerhards rgerhards@adiscon.com 2011-08-30T12:53:31+00:00 581daa5418548dda4c9b5438878559a1bbd4b087 Conflicts: ChangeLog 
Conflicts:
	ChangeLog
bugfix: off-by-one(two) bug in legacy syslog parser 2011-08-10T09:41:03+00:00 Rainer Gerhards rgerhards@adiscon.com 2011-08-10T09:41:03+00:00 1ca6cc236d1dabf1633238b873fb1c057e52f95e 






Merge branch 'v4-stable' into v4-beta
2011-08-05T12:14:23+00:00

Andre Lorbach
alorbach@adiscon.com

2011-08-05T12:14:23+00:00

a8f2fd6eb4acf7484a6de53f2175c24a2d4b4cc3

Conflicts:

	ChangeLog





Conflicts:

	ChangeLog







doc: updated rsyslog.conf man page with new syntaxes
2011-07-11T10:41:16+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-07-11T10:41:16+00:00

1234d7c8cd5d76862510cff315ea965c4f978e55












issue a warning message for old-style dynafile action
2011-07-11T07:34:26+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-07-11T07:34:26+00:00

f55eee74a3fca58f747857c9b7ec5040178a6f8b












Merge branch 'v4-stable' into v4-devel
2011-07-11T07:02:09+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-07-11T07:02:09+00:00

53265e3c7403c290158b70f7efad2b9388a06e6c

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html







support for :omfile: forward compatibility directive
2011-07-11T06:37:11+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-07-11T06:37:11+00:00

5442adf8f407594d6197e58db492f31048ac4f85












added support for the ":omusrmsg:" syntax in configuring user messages
2011-07-06T05:52:50+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-07-06T05:52:50+00:00

f09ee69ee1b7f8c098d0720c8e85a6753cc7d342












Merge branch 'v4-stable' into v4-devel
2011-05-09T10:48:15+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-09T10:48:15+00:00

1d41b9540ccf8b6714135737855ab71ee75f4364

Conflicts:
	tcpsrv.c
	tests/Makefile.am
	tests/tcpflood.c





Conflicts:
	tcpsrv.c
	tests/Makefile.am
	tests/tcpflood.c







bugfix: invalid storage type for config variables
2011-05-09T10:29:07+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-09T10:29:07+00:00

831ce25230f6c8cd7c362fda3616e1233a61cf00