rsyslog.git, branch v4.1.0 rsyslog development for Lumberjack - various unofficial and potentially rebased branches enhanced legacy syslog parser to detect year if part of the timestamp 2008-11-18T12:46:38+00:00 Rainer Gerhards rgerhards@adiscon.com 2008-11-18T12:46:38+00:00 afd425232f3198e7bb6f3dbcf0aa3cb4c24d5f7e The format is based on what Cisco devices seem to emit. 
The format is based on what Cisco devices seem to emit.
Merge branch 'beta' 2008-11-18T11:32:49+00:00 Rainer Gerhards rgerhards@adiscon.com 2008-11-18T11:32:49+00:00 ba2c160b320b5cc4dfb5190500237e09d8b5b54c 






Merge branch 'v3-stable' into beta
2008-11-18T11:32:34+00:00

Rainer Gerhards
rgerhards@adiscon.com

2008-11-18T11:32:34+00:00

c2fef48bd32ac6fcd6c8664976a39424187f4872












Merge branch 'v2-stable' into v3-stable
2008-11-18T11:32:21+00:00

Rainer Gerhards
rgerhards@adiscon.com

2008-11-18T11:32:21+00:00

2f1c53dbfe5f1e4bd79adaf55a1aa48de8d83144

Conflicts:

	ChangeLog





Conflicts:

	ChangeLog







bugfix: removed memory leak in ompgsql
2008-11-18T11:30:57+00:00

Ken
ktm@rice.edu

2008-11-18T11:30:57+00:00

48319cd31f3d15f1417d4ebd8003d93978ad36a9

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





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







Merge branch 'beta'
2008-11-18T11:05:51+00:00

Rainer Gerhards
rgerhards@adiscon.com

2008-11-18T11:05:51+00:00

599133164d93afb0dab792dadb8f5d6bc3d68a3f

Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html
	doc/property_replacer.html





Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html
	doc/property_replacer.html







Merge branch 'nextmaster'
2008-11-18T10:40:23+00:00

Rainer Gerhards
rgerhards@adiscon.com

2008-11-18T10:40:23+00:00

a5417f16044d7d56dbceeea09e25ba3e8c47cc01












preparing for 3.12.7 release
2008-11-11T16:45:49+00:00

Rainer Gerhards
rgerhards@adiscon.com

2008-11-11T16:45:49+00:00

49dcad849e93551d90cd6298a576b67c4ad0c7ef












Merge branch 'v3-stable' into beta
2008-11-11T11:58:53+00:00

Rainer Gerhards
rgerhards@adiscon.com

2008-11-11T11:58:53+00:00

c9078c722003ac87e8b39363ed9b8b70d2812dd9

Conflicts:

	ChangeLog
	doc/manual.html





Conflicts:

	ChangeLog
	doc/manual.html







Merge branch 'master' into beta
2008-11-11T11:54:44+00:00

Rainer Gerhards
rgerhards@adiscon.com

2008-11-11T11:54:44+00:00

05bd696ebb7766f33b3ae176b841bcecb0bfedfc

Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html





Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html