rsyslog.git - rsyslog development for Lumberjack - various unofficial and potentially rebased branches

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	commiting interim version with ability to specify spoof source	Rainer Gerhards	2009-07-09	1	-14/+23
\| \| \| \|
* \| \| \|	Merge branch 'master' into udpspoof & cleanup & slight optimization	Rainer Gerhards	2009-07-09	1	-1/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/msg.c I messed up and did some changes during the merge commit ;) But these are not large, just a little bit of cleanup and some very slight optimizations inside the msg object.
\| * \| \| \|	Merge branch 'v4-devel'	Rainer Gerhards	2009-07-09	1	-1/+12
\| \|\\| \| \|
\| \| * \| \|	bugfix: message could be truncated after TAG, often when forwarding	Rainer Gerhards	2009-07-09	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was a result of an internal processing error if maximum field sizes had been specified in the property replacer. Also did some testbench improvements, including omstdout.
* \| \| \| \|	first version supporting udp spoofing and non-spoofing at the same time	Rainer Gerhards	2009-07-09	1	-396/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	omudpspoof is now a dedicated output module. It's calling semantics so far are based on omfwd, plus the need for the template to have the IP address as a string in the starting position.
* \| \| \| \|	moved udp spoofing code to its own output module (omudpspoof)	Rainer Gerhards	2009-07-09	2	-0/+864
\|/ / / /
* \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2009-07-03	4	-17/+174
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/datetime.c
\| * \| \|	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-07-01	9	-22/+143
\| \|\ \ \
\| * \ \ \	Merge branch 'omfile' into v5-devel	Rainer Gerhards	2009-06-23	2	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \ \ \ \	Merge branch 'omfile' into tmp	Rainer Gerhards	2009-06-22	4	-12/+10
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
\| * \ \ \ \ \	Merge branch 'omfile' into v5-devel	Rainer Gerhards	2009-06-16	14	-42/+100
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note that this was NOT a trivial merge, and there may be some issues. This needs to be seen when we continue developing. Conflicts: runtime/msg.h runtime/obj.h runtime/queue.c runtime/srUtils.h runtime/stream.c runtime/stream.h runtime/wti.c tests/Makefile.am tools/omfile.c tools/syslogd.c
\| * \ \ \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-06-04	1	-0/+6
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/rsyslog.h
\| * \ \ \ \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-05-29	1	-3/+0
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-05-29	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into v5-devel	Rainer Gerhards	2009-05-28	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/Makefile.am
\| * \| \| \| \| \| \| \| \| \| \|	preserving current changes	Rainer Gerhards	2009-05-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... in preparation for some larger changes - I need to apply some serious design changes, as the current system does not play well at all with ultra-reliable queues. Will do that in a totally new version.
\| * \| \| \| \| \| \| \| \| \| \|	adapted testbench to new capabilities	Rainer Gerhards	2009-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... and now make check fails again, we have obviously found some new bugs thanks to the additional cases
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into ultra-reliable	Rainer Gerhards	2009-05-27	2	-14/+132
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/Makefile.am tests/diskqueue.sh tests/imtcp-multiport.sh tests/manytcp.sh tests/memq-persist.sh
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into ultra-reliable	Rainer Gerhards	2009-05-25	1	-52/+195
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/Makefile.am tests/diskqueue.sh
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into ultra-reliable	Rainer Gerhards	2009-05-22	6	-40/+52
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h tests/Makefile.am tools/syslogd.c
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	minor cleanup	Rainer Gerhards	2009-05-20	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into multi-dequeue	Rainer Gerhards	2009-05-12	2	-46/+55
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed some bugs & added testing helpers	Rainer Gerhards	2009-05-07	1	-11/+145
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The action state machine now works correctly and has been verified a few hand-picked cases. I am missing automatted tests, though, this is not easy to achive... Anyhow, I've improved omtesting, so that it can be used in such automatted tests.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	begin implementation of new transactional output module interface	Rainer Gerhards	2009-04-27	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	code is not complete, error cases are not handled.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixing a small (newly-introduced) memory leak	Rainer Gerhards	2009-04-23	1	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... plus simplifying free() calls after agreement on mailing list that we no longer need to check if the pointer is non-NULL
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added $klogConsoleLogLevel directive	Rainer Gerhards	2009-07-03	2	-9/+7
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...which permits to set a new console log level while rsyslog is active
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	now put the new property-based methods to good use	Rainer Gerhards	2009-07-01	2	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... hopefully reducing the number of allocs/frees as well as overall memory usage in a busy system (plus that these shared properties hopefully remain in cache longer than its single-instance counterparts...)
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RcvFromIP now also a property	Rainer Gerhards	2009-07-01	3	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This sets stage to enable use of the property-interface to speed up things (mildly), the next step to be done. I have also fixed one regression of yesterday's changes.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	introduced a new way of handling the RcvFrom property	Rainer Gerhards	2009-06-30	3	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... plus a fix for a long-time bug in obj-types.h. That lead to the object pointer only then to become NULL when the object was actually destructed, I discovered this issue during introduction of the pRcvFrom property in msg_t, but it potentially had other effects, too. I am not sure if some experienced instability resulted from this bug OR if its fix will cause harm to so-far "correctly" running code. The later may very well be. Thus I will change it only for the current branch and also the beta, but not in all old builds. Let's see how things evolve.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	finished transition to using inputName property	Rainer Gerhards	2009-06-30	6	-11/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... plus some celanup and adding minor missing functionality (the rule debug info again tell the property name, not just number).
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	introduced the idea of detached properties	Rainer Gerhards	2009-06-29	5	-7/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some things inside the message can be used over a large number of messages and need to to be allocated and re-written every time. I now begin to implement this as a "prop_t" object, first use for the inputName. Some input modules are already converted, some others to go. Will do a little performance check on the new method before I go further. Also, this commit has some cleanup and a few bug fixes that prevented compiliation in debug mode (I overlooked this as I did not compile for debug, what I normally do, and the automatted test also does not do that)
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add support for KLogPath	Michael Terry	2009-06-29	4	-5/+25
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	optimized hostname processing	Rainer Gerhards	2009-06-23	2	-2/+2
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	optimized handling of MSG part in msg object	Rainer Gerhards	2009-06-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WARNING: currently, message repeation processing is disabled, must be reenabled (but prefer to do some other tests first)
* \| \| \| \| \| \| \| \| \| \| \| \|	optimized TAG handling in msg object	Rainer Gerhards	2009-06-18	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	cleaned up/optimized raw message handling in msg object	Rainer Gerhards	2009-06-18	4	-8/+4
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into omfile	Rainer Gerhards	2009-06-16	4	-8/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
\| * \| \| \| \| \| \| \| \| \| \|	removed long-obsoleted property UxTradMsg	Rainer Gerhards	2009-06-16	2	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... as well as some cleanup (some commented-out code is left to support UxTradMsg again is someone really complains ;)).
\| * \| \| \| \| \| \| \| \| \| \|	some performance optimizations	Rainer Gerhards	2009-06-16	4	-5/+5
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- saved gettimeofday() calls in imtcp (and increased reception buffer) - somewhat optimized stringbuf.c - some other optimizations
* \| \| \| \| \| \| \| \| \| \|	performance-enhanced imtcp	Rainer Gerhards	2009-06-12	1	-1/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...by now using lowres time and thus saving many time() calls. This needs some performance testing and must be made configurable if it works out.
* \| \| \| \| \| \| \| \| \| \|	completed multi-ruleset core support	Rainer Gerhards	2009-06-12	1	-9/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... as well as added multi-ruleset support for imtcp
* \| \| \| \| \| \| \| \| \| \|	re-enabled pipe, tty and console in omfile	Rainer Gerhards	2009-06-12	9	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... by moving code to stream.c. Thanks to the new design, new cases are not really needed, resulting in cleaner code. I also did a cleanup of header file usage as a side-activity.
* \| \| \| \| \| \| \| \| \| \|	added $OMFileIOBufferSize config directive and plumbing	Rainer Gerhards	2009-06-04	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	cleaned up stream class ...	Rainer Gerhards	2009-06-04	1	-24/+27
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... and also made it callable via an rsyslog interface rather then relying on the OS loader (important if we go for using it inside loadbale modules, which we soon possible will)
* \| \| \| \| \| \| \| / /	added support for custom modules	Rainer Gerhards	2009-06-02	1	-0/+6
\| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... this provides some basic support to integrate extensions that are not direct parts of rsyslog to be built during its build process.
* \| \| \| \| \| \| \| \|	fix: import from beta accidently disable imdiag	Rainer Gerhards	2009-05-29	1	-3/+0
\| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'beta'	Rainer Gerhards	2009-05-29	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'v3-stable' into beta	Rainer Gerhards	2009-05-29	1	-0/+3
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \| \| \|	fixed problem in syslog-protocol (now RFC5424) parser	Rainer Gerhards	2009-05-29	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... as well as some other minor issues.
* \| \| \| \| \| \| \|	Merge branch 'beta' into master	Rainer Gerhards	2009-05-28	1	-1/+1
\|\\| \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/Makefile.am