rsyslog.git/tools, branch v5.9.7 rsyslog development for Lumberjack - various unofficial and potentially rebased branches Merge branch 'v5-stable' into v5-beta 2012-05-03T16:25:27+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-05-03T16:25:27+00:00 fdcaca6b85d65ef2c9b4814cc4a9adda4568e24f Conflicts: ChangeLog configure.ac doc/manual.html 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
debug: slightly improved debug info for input module startup 2012-05-03T06:49:05+00:00 Rainer Gerhards rgerhards@adiscon.com 2012-05-03T06:49:05+00:00 8597affe159dfd44e75bcc72a1ce42eff61da96e 






Merge branch 'v5-stable-newstats' into v5-devel
2012-04-12T12:10:36+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-04-12T12:10:36+00:00

0b8f3d5463807ae4c0a0f880b441775a51737fe8












Merge branch 'v5-stable' into v5-stable-newstats
2012-04-12T12:10:09+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-04-12T12:10:09+00:00

e4d87aac957ea639935f56fb8b03f3c03d037491

Conflicts:
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c





Conflicts:
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c







imuxsock: do not cache hostname
2012-04-12T08:14:32+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-04-12T08:14:32+00:00

d749dadcc30e35448894a152fb0ddf77d60b8300












Allocate LocalDomain as new string
2012-04-11T12:53:09+00:00

Marius Tomaschewski
mt@suse.com

2012-04-11T12:39:42+00:00

a3a0acadb4aa9d09bde3a6951557939b0a0eeda6

LocalDomain points to "" or the domain in LocalHostName,
allocate as new string before passing to SetLocalDomain
or free will fail later.

Signed-off-by: Marius Tomaschewski <mt@suse.com>





LocalDomain points to "" or the domain in LocalHostName,
allocate as new string before passing to SetLocalDomain
or free will fail later.

Signed-off-by: Marius Tomaschewski <mt@suse.com>







bugfix: hostname was not requeried on HUP
2012-04-11T09:18:41+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-04-11T09:18:41+00:00

d0a73d3449511392b115ca078517ff659aafe23d

Thanks to Marius Tomaschewski for reporting this bug.





Thanks to Marius Tomaschewski for reporting this bug.







Merge branch 'v5-stable-newstats' into v5-devel
2012-04-07T12:44:12+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-04-07T12:44:12+00:00

d53016962da179c52ad22600bd54ffd58f86a81c

Conflicts:
	configure.ac
	doc/manual.html





Conflicts:
	configure.ac
	doc/manual.html







Merge branch 'v5-stable' into v5-stable-newstats
2012-04-07T12:33:37+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-04-07T12:33:37+00:00

bfc6f6d599a4723b26708da5fddcc6db5c53fc21

Conflicts:
	configure.ac





Conflicts:
	configure.ac







milestone: added capability to use a local interface IP address as fromhost-ip
2012-03-21T10:43:45+00:00

Rainer Gerhards
rgerhards@adiscon.com

2012-03-21T10:43:45+00:00

49ec54d36984b9e91da7bd41e56e65dac22ce830

... for locally originating messages. New directive $LocalHostIPIF.
Note that not all modules yet support this new directive - next step...





... for locally originating messages. New directive $LocalHostIPIF.
Note that not all modules yet support this new directive - next step...