rsyslog.git/tests/complex1.sh, branch v5.6.5 rsyslog development for Lumberjack - various unofficial and potentially rebased branches Merge branch 'v4-stable-imptcp' into tmp 2010-08-11T09:49:32+00:00 Rainer Gerhards rgerhards@adiscon.com 2010-08-11T09:49:32+00:00 32e715929f5d946d7244db3bc0595842dd293dd9 Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am 
Conflicts:
	Makefile.am
	configure.ac
	runtime/rsyslog.h
	tests/Makefile.am
small improvements to testbench 2010-08-10T16:29:22+00:00 Rainer Gerhards rgerhards@adiscon.com 2010-08-10T16:29:22+00:00 b5b4bd138949f09b3703e6f7f5caf46d361fa41c 






Merge branch 'v4-stable' into v4-devel
2010-04-12T13:10:00+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-04-12T13:10:00+00:00

7053a438efd07361b6e33de4bdf254b1d3b58553

Conflicts:
	ChangeLog





Conflicts:
	ChangeLog







solving a number of minor (but annoying) issues in the build system
2010-04-12T12:59:52+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-04-12T12:59:52+00:00

4ebd062564c068566d60b4f54c047e6c082edf8e












testbench improved to run on Solaris
2010-03-25T13:58:23+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-03-25T13:58:23+00:00

ec883905c13920de0bc33e5bdd0a75c80535b55c












adding testcase files missing in git
2010-03-23T06:22:07+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-03-23T06:22:07+00:00

41552fbc5061072f0da0548b84f4da99a6eca2ed