rsyslog.git, branch v4.3.2 rsyslog development for Lumberjack - various unofficial and potentially rebased branches cleanup (removed left-over from backport) 2009-06-24T08:29:57+00:00 Rainer Gerhards rgerhards@adiscon.com 2009-06-24T08:29:57+00:00 675d46f5b59f64e378968baa5e0dec6810090287 






Merge branch 'v4-stable' into beta
2009-06-24T08:15:07+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-24T08:15:07+00:00

2533c07a709d16f496f6ec6c5deee02784e242a9












Merge branch 'v3-stable' into v4-stable
2009-06-24T08:14:56+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-24T08:14:56+00:00

11cda87ededbed4441916a29fec3a3a75d7eb87c












minor doc bugfix: name of rsyslogd.pid corrected (was syslogd.pid)
2009-06-24T08:14:23+00:00

Michael Biebl
biebel@debian.org

2009-06-24T08:14:23+00:00

71c57cfa12a99c9ef8d461b5cf703706825d23fa

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>





Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>







Merge branch 'v4-stable' into beta
2009-06-24T08:11:41+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-24T08:11:41+00:00

eece1c3cd1c7379fbfabaa75444b0b5275a0886b

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html







minor: prepped ChangeLog for next beta
2009-06-24T08:09:57+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-24T08:09:57+00:00

a48918cc2783f4351b246c97cd9669abb9d0de47












finishing touches for 4.2.0
2009-06-22T17:45:53+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-22T17:45:53+00:00

2d548d56c2cb5c4018994a9e3bae306bdf35f38f












preparing for v4-stable
2009-06-22T17:22:24+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-22T17:22:24+00:00

5310ccee3159c298cfd6e3af47c50d8b302894ec












Merge branch 'beta'
2009-06-18T09:11:59+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-18T09:11:59+00:00

a6ed4b59cc39fe802d06f113f238f1ffe90b7cf6












Merge branch 'v3-stable' into beta
2009-06-18T09:11:07+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-06-18T09:11:07+00:00

17133f2cd18a2b5376d40a01b87c970b3a47c265