<feed xmlns='http://www.w3.org/2005/Atom'>
<title>rsyslog.git, branch v3.14.2</title>
<subtitle>rsyslog development for Lumberjack - various unofficial and potentially rebased branches</subtitle>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/'/>
<entry>
<title>finalized 3.14.2 release</title>
<updated>2008-04-09T15:45:43+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-09T15:45:43+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=3853f06d948703f6a28fa6a131ea04521543d011'/>
<id>3853f06d948703f6a28fa6a131ea04521543d011</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>improved detection of modules being loaded more than once</title>
<updated>2008-04-09T10:54:21+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-09T10:54:21+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=1544eb74336d64acdd9250c99d8ab7bbe1de4577'/>
<id>1544eb74336d64acdd9250c99d8ab7bbe1de4577</id>
<content type='text'>
thanks to varmojfekoj for the patch
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
thanks to varmojfekoj for the patch
</pre>
</div>
</content>
</entry>
<entry>
<title>typo fix (but an *interesting* typo) ;)</title>
<updated>2008-04-08T16:47:43+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T16:47:43+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=7451f8e283d79f919786e2254b5443cc9ea1e74c'/>
<id>7451f8e283d79f919786e2254b5443cc9ea1e74c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>bugfix: some legacy options not correctly interpreted - thanks to</title>
<updated>2008-04-08T15:10:52+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T15:10:52+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=2a6b13ae0d11244648f3705dc20cc90aa83b9a3d'/>
<id>2a6b13ae0d11244648f3705dc20cc90aa83b9a3d</id>
<content type='text'>
varmojfekoj for the patch
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
varmojfekoj for the patch
</pre>
</div>
</content>
</entry>
<entry>
<title>rklogd is no longer part of rsyslog, so we don't need the man</title>
<updated>2008-04-08T14:02:16+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T14:02:16+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=830be9525052f89aa5b436883083f0df047842bc'/>
<id>830be9525052f89aa5b436883083f0df047842bc</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>clean up the mess we created in CVS</title>
<updated>2008-04-08T14:01:12+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T14:01:12+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=91b590916893031e7313a9f94551e708c1a02cd2'/>
<id>91b590916893031e7313a9f94551e708c1a02cd2</id>
<content type='text'>
This is an attempt to clean up the CVS import. In CVS, we applied the
patches manually to each branch. Of course, this now results in lots and
lots of conflicts when we try to do a git merge. I have now merged, but
copied the v3-stable files back unaltered. The idea is that once this
is committed we will be able to merge new changes to the v2-stable branch
into v3-stable without any further problems.

Conflicts:

	ChangeLog
	cfsysline.c
	configure.ac
	doc/Makefile.am
	doc/features.html
	doc/history.html
	doc/manual.html
	doc/professional_support.html
	doc/property_replacer.html
	doc/rsyslog_conf.html
	doc/status.html
	gss-misc.h
	linkedlist.c
	module-template.h
	modules.c
	msg.c
	omfile.c
	omfwd.c
	pidfile.c
	plugins/omgssapi/Makefile.am
	plugins/omgssapi/omgssapi.c
	rfc3195d.8
	rklogd.8
	rsyslog.conf.5
	rsyslog.h
	rsyslogd.8
	stringbuf.c
	syslogd.c
	syslogd.h
	tcpsyslog.c
	tcpsyslog.h
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This is an attempt to clean up the CVS import. In CVS, we applied the
patches manually to each branch. Of course, this now results in lots and
lots of conflicts when we try to do a git merge. I have now merged, but
copied the v3-stable files back unaltered. The idea is that once this
is committed we will be able to merge new changes to the v2-stable branch
into v3-stable without any further problems.

Conflicts:

	ChangeLog
	cfsysline.c
	configure.ac
	doc/Makefile.am
	doc/features.html
	doc/history.html
	doc/manual.html
	doc/professional_support.html
	doc/property_replacer.html
	doc/rsyslog_conf.html
	doc/status.html
	gss-misc.h
	linkedlist.c
	module-template.h
	modules.c
	msg.c
	omfile.c
	omfwd.c
	pidfile.c
	plugins/omgssapi/Makefile.am
	plugins/omgssapi/omgssapi.c
	rfc3195d.8
	rklogd.8
	rsyslog.conf.5
	rsyslog.h
	rsyslogd.8
	stringbuf.c
	syslogd.c
	syslogd.h
	tcpsyslog.c
	tcpsyslog.h
</pre>
</div>
</content>
</entry>
<entry>
<title>removed files that no (longer) belong under souce control</title>
<updated>2008-04-08T13:53:15+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T13:53:15+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=894ba37a55f5f723e3b87e87262707903b2ed6a2'/>
<id>894ba37a55f5f723e3b87e87262707903b2ed6a2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>- bugfixes in legacy options processing, credits to varmojfekoj</title>
<updated>2008-04-08T12:49:26+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T12:49:26+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=9ae630384e1d95d7289f44c8ac20597311704914'/>
<id>9ae630384e1d95d7289f44c8ac20597311704914</id>
<content type='text'>
  * reset errno before printing a warning message
  * misspelled directive name in code processing legacy options
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
  * reset errno before printing a warning message
  * misspelled directive name in code processing legacy options
</pre>
</div>
</content>
</entry>
<entry>
<title>cleanup and bugfix in imklog</title>
<updated>2008-04-08T12:40:19+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T12:40:19+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=769598da4cfc7c9fb3ceb337044a9313e4b1b68d'/>
<id>769598da4cfc7c9fb3ceb337044a9313e4b1b68d</id>
<content type='text'>
- some cleanup in imklog
- bugfix: potential segfault in imklog when kernel is compiled without
  /proc/kallsyms and the file System.map is missing. Thanks to
    Andrea Morandi for pointing it out and suggesting a fix.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- some cleanup in imklog
- bugfix: potential segfault in imklog when kernel is compiled without
  /proc/kallsyms and the file System.map is missing. Thanks to
    Andrea Morandi for pointing it out and suggesting a fix.
</pre>
</div>
</content>
</entry>
<entry>
<title>bugfix: imklog did not work well with kernel 2.6+.</title>
<updated>2008-04-08T11:50:52+00:00</updated>
<author>
<name>Rainer Gerhards</name>
<email>rgerhards@adiscon.com</email>
</author>
<published>2008-04-08T11:50:52+00:00</published>
<link rel='alternate' type='text/html' href='https://fedorapeople.org/cgit/mitr/public_git/rsyslog.git/commit/?id=e2502c6d8ff9edd57b706657ab12df32c8b41514'/>
<id>e2502c6d8ff9edd57b706657ab12df32c8b41514</id>
<content type='text'>
Thanks to Peter Vrabec for patching it based on the development in
sysklogd - and thanks to the sysklogd project for upgrading klogd to
support the new functionality.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Thanks to Peter Vrabec for patching it based on the development in
sysklogd - and thanks to the sysklogd project for upgrading klogd to
support the new functionality.
</pre>
</div>
</content>
</entry>
</feed>
