rsyslog.git/plugins, branch master rsyslog development for Lumberjack - various unofficial and potentially rebased branches Merge branch 'beta' 2012-10-19T07:33:33+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-10-19T07:33:33+00:00 b151584d0929759284c0fb0399709e5ca0e29d60 






Merge branch 'v6-stable' into beta
2012-10-19T07:33:22+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-19T07:33:22+00:00

e9cf777ca422a964b4324111f4c93d84652ce2fc












Merge branch 'v5-stable' into v6-stable
2012-10-19T07:32:58+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-19T07:32:58+00:00

16e3921905bb0b3f48b0b387e750d0f40439d634

Conflicts:
	runtime/nsdpoll_ptcp.c





Conflicts:
	runtime/nsdpoll_ptcp.c







fix epoll-enabled code to use correct data member for pointers
2012-10-19T07:07:32+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-19T07:07:32+00:00

d36407c7947ba119c971427e1528122509bf895f












Merge branch 'beta'
2012-10-19T06:13:15+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-19T06:13:15+00:00

d2f2eaf67ef13faf23fd2231076c937812db9050

Conflicts:
	ChangeLog





Conflicts:
	ChangeLog







Merge branch 'v6-stable' into beta
2012-10-19T06:10:24+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-19T06:10:24+00:00

f2e64772488170f21c333cc0bfcf5f289007f457












bugfix: imuxsock did not properly honor $LocalHostIPIF
2012-10-19T06:08:46+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-19T06:08:46+00:00

d4690ae053b1b26fd215485f08875d508d7c4eba












Merge branch 'beta'
2012-10-18T12:36:17+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-18T12:36:17+00:00

9bdc8e3702277f8798a32139c0c7c1c83acecdaa

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html







build: Drop unused include path
2012-10-18T10:58:04+00:00

Michael Biebl
biebl@debian.org

2012-10-04T20:35:01+00:00

482f89ab72d53acc60d77ce3e74ac23796e30abd












Merge branch 'master-newtemplate'
2012-10-18T10:49:06+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-18T10:49:06+00:00

890e20d1d89104c7e4ea47799d997a94d4f9cb1d