rsyslog.git, branch v5.2.0 rsyslog development for Lumberjack - various unofficial and potentially rebased branches preparing for version 5.2.0 2009-11-02T10:59:27+00:00 Rainer Gerhards rgerhards@adiscon.com 2009-11-02T10:59:27+00:00 81bf276d9274564fcd08790aa57836dd3ca4c1c6 






Merge branch 'v4-beta' into beta
2009-10-21T10:13:22+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-21T10:13:22+00:00

adb880f17bee807df6058ab3772eed3d35bd8d37












Merge branch 'v4-stable' into v4-beta
2009-10-21T10:04:59+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-21T10:04:59+00:00

04ca2611194affee966344db20cdaa7c663f99d9

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imrelp/imrelp.c





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imrelp/imrelp.c







Merge branch 'aaron' into v4-beta
2009-10-21T08:51:43+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-21T08:51:43+00:00

3187982c3c94e5eac257e206f19fa7326c8e7739

Conflicts:
	ChangeLog





Conflicts:
	ChangeLog







preparing for 4.5.5
2009-10-21T08:50:22+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-21T08:50:22+00:00

b513239352dd0c2c2fbf94e08af664e09a4bed41












bumped version number
2009-10-20T13:12:00+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-20T13:12:00+00:00

9407f2a3e08940d0dd0367c5904654f5a56117af












added imported bugfix to changelog
2009-10-20T09:09:20+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-20T09:09:20+00:00

24d5ecc891752003e63ff39e946b1b17a81a886b












Merge branch 'v3-stable' into v4-stable
2009-10-20T09:07:52+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-20T09:07:52+00:00

b840e300dfd2bea4194786974c5e9fbec26e4b96












bugfix: potential hang condition on queue shutdown
2009-10-20T09:05:02+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-20T09:05:02+00:00

8e45fd5c8e7df45532c5d239676cd92107c9e942












prepared for 5.1.6, corrected typo
2009-10-15T08:21:49+00:00

Rainer Gerhards
rgerhards@adiscon.com

2009-10-15T08:21:49+00:00

38f98211cd338697afe72200dd53826113cd43f9