rsyslog.git/runtime, 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 'master-newtemplate'
2012-10-18T10:49:06+00:00

Rainer Gerhards
rgerhards@adiscon.com

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

890e20d1d89104c7e4ea47799d997a94d4f9cb1d












Merge branch 'beta'
2012-10-11T16:31:50+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-11T16:31:50+00:00

949c75305ccae64f1ca0546eab71f1950999460f












Fix crash when date properties are used without a template
2012-10-11T16:11:47+00:00

Miloslav Trmač
mitr@redhat.com

2012-09-25T11:52:41+00:00

5552202b01fd4f472d23aa50db6614ec2fe9c68e

E.g. in
> set $!time = $timereported;
> set $!time_rcvd = $timegenerated;
pTpe is set to NULL by the caller.

(Is "default" the correct format to use?)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>





E.g. in
> set $!time = $timereported;
> set $!time_rcvd = $timegenerated;
pTpe is set to NULL by the caller.

(Is "default" the correct format to use?)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>







Fix crash when date properties are used without a template
2012-10-11T16:10:45+00:00

Miloslav Trmač
mitr@redhat.com

2012-09-25T11:52:41+00:00

3b5e2ec7b2d21cc145b62e8e6bcf5e58eb94918c

E.g. in
> set $!time = $timereported;
> set $!time_rcvd = $timegenerated;
pTpe is set to NULL by the caller.

(Is "default" the correct format to use?)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>





E.g. in
> set $!time = $timereported;
> set $!time_rcvd = $timegenerated;
pTpe is set to NULL by the caller.

(Is "default" the correct format to use?)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>







Merge branch 'beta'
2012-10-11T13:38:09+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-11T13:38:09+00:00

7bebfd3b60894bd913e3d6cbcad5447a607e0a0b

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html





Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html







added deprecated note to omruleset
2012-10-11T13:27:27+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-10-11T13:27:27+00:00

a208fcfc707c8c69b79e7623383a2c592d9f0741