rsyslog.git/doc, branch v6.1.10 rsyslog development for Lumberjack - various unofficial and potentially rebased branches prepare for 6.1.10 2011-06-22T08:27:20+00:00 Rainer Gerhards rgerhards@adiscon.com 2011-06-22T08:27:20+00:00 44609ec259fdd321520111049ace194a0941a157 






Merge branch 'v5-stable' into beta
2011-06-21T13:42:11+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-06-21T13:42:11+00:00

b71ef4abad365f95cf7adf3df14083940d531f1f

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/diag.sh
	tests/sndrcv_drvr.sh





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/diag.sh
	tests/sndrcv_drvr.sh







preparing for 5.8.2
2011-06-21T08:03:47+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-06-21T08:03:47+00:00

de33ec026e505658d613b372ea9d32656ebb86d8












Merge branch 'v4-stable' into v5-stable
2011-06-15T10:21:36+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-06-15T10:21:36+00:00

1b9dffd5501807af9472a12c702aa582b23fca96

Conflicts:
	doc/rsyslog_conf_global.html





Conflicts:
	doc/rsyslog_conf_global.html







doc: clarified requirements for $WorkDirectory directive
2011-06-15T10:02:39+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-06-15T10:02:39+00:00

a201de795ad630ddf81fea9f7bbb13ad79bdfff4












preparing for 6.1.9 release
2011-06-14T13:45:52+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-06-14T13:45:52+00:00

b1a905c5eb7833d661be4a910697f49deb34c640












preparing for 6.1.8 release
2011-05-21T02:18:51+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-21T02:18:51+00:00

715b9fe052f5a7c622a1f71f905461e06e398de8












Merge branch 'v5-stable' into beta
2011-05-20T09:48:17+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-20T09:48:17+00:00

ac32d356b5b776e0ca549d5c689a8932af4c2171

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





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







preparing for 5.8.1 stable
2011-05-19T10:44:28+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-19T10:44:28+00:00

c399118345dff8568613133054e98ddf46d67aa5












mmsnmptrapd: added doc & mentioned in ChangeLog
2011-05-10T07:04:23+00:00

Rainer Gerhards
rgerhards@adiscon.com

2011-05-10T07:04:23+00:00

e8a71cd0d6ea72cb6495305286cb778b9d951e0c