rsyslog.git, branch v5.7.2 rsyslog development for Lumberjack - various unofficial and potentially rebased branches bumped version to 5.7.2 2010-11-30T10:23:12+00:00 Rainer Gerhards rgerhards@adiscon.com 2010-11-30T10:23:12+00:00 1aac36dfd077073a76b80368f893810e1741a1ec 






Merge branch 'v5-beta' into v5-devel
2010-11-25T16:43:51+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-11-25T16:43:51+00:00

44300ddcb2904105e2ecd56479bf396399dcab26

Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	plugins/imfile/imfile.c
	runtime/rsyslog.h





Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	plugins/imfile/imfile.c
	runtime/rsyslog.h







bugfix: replacements for atomic operations for non-int sized types had problems.
2010-11-25T16:20:55+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-11-25T16:20:55+00:00

a3c81f500a4d952ce93162a730cadee8fbc8116b

At least one instance of that problem could potentially lead
to abort (inside omfile).





At least one instance of that problem could potentially lead
to abort (inside omfile).







bugfix: atomic increment for msg object may not work correct on all platforms.
2010-11-25T14:51:49+00:00

Chris Metcalf
cmetcalf@tilera.com

2010-11-25T14:51:49+00:00

afafd9e0d7b333c54613670f4b9dbe3ae90ec51d

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>





Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>







forgot to add to ChangeLog
2010-11-25T14:06:49+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-11-25T14:06:49+00:00

64ecd12021dad06df365f94f7fddd44ebfbd0eb2












streamlined epoll_create() code a little bit
2010-11-25T13:52:38+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-11-25T13:52:38+00:00

775464beaa6610a28f574e40eb94393959cdab2b












fixed compile problem in imptcp if no epoll_create1() is present
2010-11-25T13:51:02+00:00

David Hill
david.hill@ubisoft.com

2010-11-25T13:51:02+00:00

e4e263243ae1004380e38e638a6d3d3759c5a90c

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>





Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>







Merge branch 'v5.6.0a' into v5-stable
2010-11-25T13:47:21+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-11-25T13:47:21+00:00

65c7f4689387d61c55280ac9f2aea0317d5b8ee2

Conflicts:
	configure.ac





Conflicts:
	configure.ac







final cleanup for 5.6.1
2010-11-24T15:27:14+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-11-24T15:27:14+00:00

e4ac19d8ff2a7ef7698048e7c732f4e404f007b8












Merge branch 'v4-stable' into v5-stable
2010-11-24T11:57:46+00:00

Rainer Gerhards
rgerhards@adiscon.com

2010-11-24T11:57:46+00:00

b4da4fdac930edc10b6184422aee02f56b631fc5

Conflicts:
	configure.ac





Conflicts:
	configure.ac