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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'v4-stable-tmp' into v5-devel-tmp	Rainer Gerhards	2012-01-10	1	-1/+5
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: dirty.h tools/syslogd.c
\| *	Merge branch 'tmp' into v4-stable-tmp	Rainer Gerhards	2012-01-10	1	-1/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
\| \| *	added $SpaceLFOnReceive config directive	Tomas Heinrich	2012-01-10	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2012-01-09	1	-5/+5
\|\ \ \
\| * \| \|	bugfix: instabilities when using RFC5424 header fields	Kaiwang Chen	2012-01-09	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \|	bugfix: stats counter were not properly initialized on creation	Rainer Gerhards	2011-12-20	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2011-12-20	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: plugins/imuxsock/imuxsock.c
\| * \| \| \|	bugfix: stats counter were not properly initialized on creation	Rainer Gerhards	2011-12-20	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2011-12-19	1	-4/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| * \| \| \|	better performance for action stats & cleanup: removing debug prints	Rainer Gerhards	2011-12-19	1	-4/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'v5-stable-newstats' into v5-devel	Rainer Gerhards	2011-12-19	1	-3/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog action.c
\| * \| \| \|	added instrumentation	Rainer Gerhards	2011-12-19	2	-1/+12
\| \|/ / /
\| * \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-12-01	1	-1/+1
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: action.c
\| \| * \|	Merge branch 'v3-stable' into v4-stable	Rainer Gerhards	2011-12-01	1	-1/+1
\| \| \|\ \
\| \| \| * \|	bugfix: cosmetic: proper constant used instead of number in open call	Tomas Heinrich	2011-12-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| * \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-10-27	1	-2/+6
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \|	bugfix: potential abort after reading invalid X.509 certificate	Tomas Heinrich	2011-10-27	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
\| \| * \| \|	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-11	1	-1/+1
\| \| \|\ \ \
\| \| \| * \| \|	Added MsgDup bugfix from v5-stable into v4-stable branch	Andre Lorbach	2011-08-11	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-beta	Rainer Gerhards	2011-08-09	1	-1/+1
\| \| \|\\| \| \|
\| \| * \| \| \|	Merge branch 'v4-stable' into v4-beta	Andre Lorbach	2011-08-05	1	-7/+7
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \| \| \| \|	issue a warning message for old-style dynafile action	Rainer Gerhards	2011-07-11	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'v4-stable' into v4-devel	Rainer Gerhards	2011-07-11	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
* \| \| \| \| \| \| \|	experimental: added first stats counter to action object	Rainer Gerhards	2011-12-16	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	more work on queue statistics counter	Rainer Gerhards	2011-12-16	2	-5/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	new stats counter "discarded" for queue object	Rainer Gerhards	2011-12-16	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tells how many messages have been discarded due to queue full condition.
* \| \| \| \| \| \| \|	enhanced module loader to not rely on PATH_MAX	Rainer Gerhards	2011-12-16	1	-34/+46
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	one further change to support gnutls without libgcrypt	Rainer Gerhards	2011-10-21	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-10-21	3	-3/+4
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| * \| \| \| \| \| \|	bugfix: missing whitespace after property-based filter was not detected	Rainer Gerhards	2011-10-21	2	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	bugfix: $OMFileFlushInterval period was doubled - now using correct value	Rainer Gerhards	2011-10-18	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	removed dependency on gcrypt for recently-enough GnuTLS	Rainer Gerhards	2011-10-17	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see: http://bugzilla.adiscon.com/show_bug.cgi?id=289
* \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-10-17	2	-11/+51
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \| \| \| \| \| \|	bugfix: race condition when extracting structured data and PROCID	Rainer Gerhards	2011-10-13	1	-3/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	same issue as previous commit for PROGNAME and APPNAME
\| * \| \| \| \| \| \|	bugfix: race condition when extracting program name and APPNAME	Rainer Gerhards	2011-10-13	1	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	could lead to invalid characters e.g. in dynamic file names
\| * \| \| \| \| \| \|	bugfix: imfile did invalid system call under some circumstances	Rainer Gerhards	2011-10-07	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas.
* \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-09-26	1	-1/+0
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
\| * \| \| \| \| \| \|	bugfix: omfile returns fatal error code for things that go really wrong	Rainer Gerhards	2011-09-26	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
* \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-18	1	-0/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| * \| \| \| \| \| \|	removed debug code from action.c and runtime/queue.c after testing	Andre Lorbach	2011-08-18	1	-4/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	bugfix: fixed incorrect state handling for Discard Action (transactions)	Andre Lorbach	2011-08-18	1	-0/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-16	1	-2/+10
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| * \| \| \| \| \| \|	Added debug output into message parsers needed for bugtracking	Andre Lorbach	2011-08-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed version to 5.8.5-pre1
\| * \| \| \| \| \| \|	bugfixes for tag emulation	Rainer Gerhards	2011-08-11	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-11	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| * \| \| \| \| \| \|	Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag	Andre Lorbach	2011-08-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The syslogtag of the duplicated message could get contain garbage at the end as the string terminating NULL Byte was missing.
* \| \| \| \| \| \| \|	Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into ↵	Andre Lorbach	2011-08-10	3	-6/+28
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v5-devel
\| * \ \ \ \ \ \ \	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-08-09	1	-1/+1
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	added capability to emit config error location info for warnings	Rainer Gerhards	2011-08-09	3	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
* \| \| \| \| \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Andre Lorbach	2011-08-10	2	-4/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| / / / / / / / \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|