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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v5-beta'	Rainer Gerhards	2011-02-25	2	-3/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	cosmetic: removing commented-out testing aid	Rainer Gerhards	2011-02-25	1	-1/+0
\| \|
\| *	bugfix (minor): warning message suggested invalid compatibility mode	Rainer Gerhards	2011-02-22	1	-1/+1
\| \|
\| *	regression: fixed compile error with --enable-debug	Rainer Gerhards	2011-02-21	1	-1/+0
\| \|
* \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-02-18	3	-10/+6
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
\| *	bugfix: fixed compile problem due to empty structs	Dražen Kačar	2011-02-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	this occured only on some platforms/compilers. thanks to Dražen Kačar for the fix Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| *	cleanup: no longer parameter in iminternal system removed	Rainer Gerhards	2011-02-16	3	-10/+6
\| \|
* \|	Merge branch 'v5-beta'	Rainer Gerhards	2011-02-11	1	-3/+36
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| *	fixed some compile issues in recent systemd patch	Rainer Gerhards	2011-02-11	1	-1/+1
\| \|
\| *	Improved systemd socket activation support	Marius Tomaschewski	2011-02-11	1	-3/+36
\| \| \| \| \| \| \| \| \| \| \| \|	Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de>
* \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-12-17	5	-17/+10
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c
\| *	Merge branch 'v4-devel' into v5-devel	Rainer Gerhards	2010-12-17	1	-3/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c
\| \| *	added $LocalHostName config directive & some bugfixing	Rainer Gerhards	2010-12-16	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- added $LocalHostName config directive - bugfix: local hostname was pulled too-early, so that some config directives (namely FQDN settings) did not have any effect
\| \| *	cleanup of cosmetic nit (result of clang static code analyser run)	Rainer Gerhards	2010-12-16	1	-1/+1
\| \| \|
\| \| *	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-12-16	5	-8/+2
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/parser.c
\| \| * \	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2010-10-19	2	-1/+2
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/cfsysline.c tools/ompipe.c
\| * \| \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2010-12-17	5	-7/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \ \ \	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-12-16	4	-6/+2
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
\| \| \| * \| \|	some cleanup based on clang static analyzer results	Rainer Gerhards	2010-12-16	4	-6/+0
\| \| \| \| \| \|
\| \| \| * \| \|	typo fix (thanks to Björn Påhlsson for finding it!)	Michael Biebl	2010-11-30	1	-2/+2
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| * \| \|	fixed cosmetic nit (as a result of clang static code analyzer run)	Rainer Gerhards	2010-12-16	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	bugfix: one type of 64bit atomics was enabled when 32bit atomics were supported	Rainer Gerhards	2010-12-02	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also cleaned up some minor things
* \| \| \| \|	mmnormalize loads & runs (basic testing done)	Rainer Gerhards	2010-12-01	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-11-25	1	-1/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/rsyslog.h
\| * \| \| \|	Merge branch 'v5-beta' into v5-devel	Rainer Gerhards	2010-11-25	1	-1/+5
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.	Rainer Gerhards	2010-11-25	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At least one instance of that problem could potentially lead to abort (inside omfile).
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-22	2	-1/+2
\|\\| \| \| \|
\| * \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2010-10-22	2	-1/+2
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2010-10-19	2	-1/+2
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
\| \| \| * \|	fixing some compile problems on FreeBSD	Rainer Gerhards	2010-10-19	2	-1/+2
\| \| \| \| \|
\| \| * \| \|	Merge branch 'v4-devel' into v5-beta	Rainer Gerhards	2010-10-15	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile.am tests/tcpflood.c
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-15	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \|	removed need for math library	Rainer Gerhards	2010-10-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	by doing math a little bit more optimal in hash table code. Also reduced memory requirement for imuxsock hash tables (expected number of connections was set too high -- table can be extended dynamically).
* \| \| \| \|	omhdfs: fixed some issues with new config interface functions	Rainer Gerhards	2010-10-05	1	-22/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	also did some cleanup in omfile.c
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-10-05	2	-5/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
\| * \| \| \|	imuxsock: changed to per-pid ratelimiting	Rainer Gerhards	2010-09-28	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	minor: improved error message when already running	Rainer Gerhards	2010-09-17	1	-4/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2010-09-08	2	-30/+33
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \| \| \|	Merge branch 'systemd' into v5-devel	Rainer Gerhards	2010-09-08	2	-30/+33
\| \|\ \ \ \
\| \| * \| \| \|	acquire /dev/log socket optionally from systemd	Lennart Poettering	2010-09-07	2	-30/+33
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into tmp	Rainer Gerhards	2010-08-11	1	-1/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h also updated omuxsock and imptcp to new interfaces
\| * \| \| \| \|	Merge branch 'v4-devel' into master	Rainer Gerhards	2010-08-11	1	-1/+1
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| / / \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \|	Conflicts: Makefile.am tests/tcpflood.c
\| \| * \| \|	Merge branch 'v4-stable-imptcp' into tmp	Rainer Gerhards	2010-08-11	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
\| \| \| * \| \|	added imptcp	Rainer Gerhards	2010-08-10	1	-1/+1
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
\| * \| \| \|	changed omudpspoof default spoof address to simplify typical use case	Rainer Gerhards	2010-08-05	1	-0/+3
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	fixed regression from last commit	Rainer Gerhards	2010-07-27	6	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config variables were not properly initialized
* \| \| \|	milestone commit: output plugin interface changes (may NOT run)	Rainer Gerhards	2010-07-27	6	-103/+186
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The output interface has been changed, but we do not yet utilize the new interface. Also, it looks like a regression was introduced. But before hunting it down, I'd like to make a commit (what also easys the regresion hunt).
* \| \| \|	added support to save/restore rsyslog core action settings...	Rainer Gerhards	2010-07-23	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	... but not those of plugins (which are at least as important as the core ones). So this is an interim commit.
* \| \| \|	moving towards scoping inside rsyslog.conf	Rainer Gerhards	2010-07-21	3	-77/+77
\|/ / / \| \| \| \| \| \| \| \| \|	first step: adding object-type specifier to config statement table
* \| \|	fixed a couple of regressions	Rainer Gerhards	2010-06-23	4	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	by implementing some code that was missing so far ;) as well as finding some real bugs. I also did some general cleanup, removing debug strings and such. This code should be fairly OK to use, except when "exec only when previous action was suspended" is used -- this is NOT yet re-implemented in the tuned engine.