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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'beta'	Rainer Gerhards	2011-08-31	1	-0/+3
\|\ \| \| \| \| \| \| \| \|	Conflicts: action.c
\| *	cosmetic: adding imported bugfix to ChangeLog	Rainer Gerhards	2011-08-31	1	-0/+1
\| \|
\| *	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-08-31	1	-0/+1
\| \|\
\| \| *	bugfix: mark message processing did not work correctly	Rainer Gerhards	2011-08-31	1	-0/+1
\| \| \|
* \| \|	Merge branch 'beta'	Rainer Gerhards	2011-08-30	1	-5/+10
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| * \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-08-30	1	-4/+8
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| *	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-08-30	1	-3/+6
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog tools/syslogd.c
\| \| \| *	added bug info to ChangeLog	Rainer Gerhards	2011-08-30	1	-2/+3
\| \| \| \|
\| \| \| *	Added MsgDup bugfix from v5-stable into v4-stable branch	Andre Lorbach	2011-08-11	1	-0/+1
\| \| \| \|
* \| \| \|	Merge branch 'beta'	Andre Lorbach	2011-08-18	1	-1/+9
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/queue.c
\| * \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-18	1	-1/+9
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac
\| \| * \|	bugfix: fixed incorrect state handling for Discard Action (transactions)	Andre Lorbach	2011-08-18	1	-0/+3
\| \| \| \|
\| \| * \|	bugfixes for tag emulation	Rainer Gerhards	2011-08-11	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* \| \| \|	Merge branch 'beta'	Andre Lorbach	2011-08-11	1	-1/+5
\|\\| \| \|
\| * \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-11	1	-1/+5
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html
\| \| * \|	fixed typo in changelog	Andre Lorbach	2011-08-10	1	-1/+1
\| \| \| \|
\| \| * \|	added changelog entry	Andre Lorbach	2011-08-10	1	-0/+3
\| \| \| \|
\| \| * \|	preparing for version 5.8.4v5.8.4	root	2011-08-10	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-10	1	-0/+3
\| \|\\| \|
* \| \| \|	Merge branch 'v5-stable'	Andre Lorbach	2011-08-10	1	-0/+3
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Added changelog entry for bugid 275	Andre Lorbach	2011-08-10	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'beta'	Rainer Gerhards	2011-08-09	1	-0/+9
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	minor: added imported bug to ChangeLog	Rainer Gerhards	2011-08-09	1	-0/+3
\| \| \| \|
\| * \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-08-09	1	-0/+6
\| \|\\| \|
\| \| * \|	cosmetic: add imported bugfix to ChangeLog	Rainer Gerhards	2011-08-09	1	-0/+3
\| \| \| \|
\| \| * \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-08-09	1	-0/+3
\| \| \|\\|
\| \| \| *	bugfix: memcpy overflow can occur in allowed sender checking	Marius Tomaschewski	2011-08-09	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...if a host name is resolved to IPv4-mapped-on-IPv6 address. Found by Ismail Dönmez at suse. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* \| \| \|	- imudp&imtcp now report error if no listener at all was defined	Rainer Gerhards	2011-08-05	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks to Marcin for suggesting this error message
* \| \| \|	Merge branch 'beta'	Andre Lorbach	2011-08-05	1	-2/+16
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| * \| \|	Merge branch 'v5-stable' into beta	Andre Lorbach	2011-08-05	1	-0/+10
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| * \|	Merge branch 'v4-stable' into v5-stable	Andre Lorbach	2011-08-05	1	-0/+4
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog
\| \| \| *	Merge branch 'v3-stable' into v4-stable	Andre Lorbach	2011-08-05	1	-0/+4
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: runtime/msg.c
\| \| \| \| *	bugfix: potential misadressing in property replacer	Andre Lorbach	2011-08-05	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Added changelog entry	Andre Lorbach	2011-08-05	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	preparing for 6.1.11v6.1.11	Rainer Gerhards	2011-07-11	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'v5-stable' into beta	Rainer Gerhards	2011-07-11	1	-3/+9
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
* \| \| \| \|	preparing for 6.3.4 releasev6.3.4	Rainer Gerhards	2011-08-02	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	added new functionality to ChangeLog	Rainer Gerhards	2011-08-02	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	omusrmsg now supports the new config system	Rainer Gerhards	2011-07-21	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	bugfix: misaddressing in config handler	Rainer Gerhards	2011-07-15	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In theory, can cause segfault, in practice this is extremely unlikely Thanks to Marcin for alertig me.
* \| \| \| \|	some more cleanup	Rainer Gerhards	2011-07-15	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preparing for a new, higher performance, variant object type
* \| \| \| \|	preparing for 6.3.3v6.3.3	Rainer Gerhards	2011-07-13	1	-2/+3
\| \| \| \| \|
* \| \| \| \|	proudly added new conf parser to ChangeLog ;-)	Rainer Gerhards	2011-07-12	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master-newconf'	Rainer Gerhards	2011-07-12	1	-3/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog tools/omfile.c
\| * \| \| \| \|	removed compatibility mode as we expect people have adjusted their confs by now	Rainer Gerhards	2011-07-12	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'v5-devel'	Rainer Gerhards	2011-07-11	1	-3/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| * \| \| \| \| \|	preparing for 5.9.2v5.9.2	Rainer Gerhards	2011-07-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'v5-stable' into v5-devel	Rainer Gerhards	2011-07-11	1	-2/+9
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
\| \| * \| \| \| \|	preparing for 5.8.3v5.8.3	Rainer Gerhards	2011-07-11	1	-1/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'v4-stable' into v5-stable	Rainer Gerhards	2011-07-11	1	-1/+3
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh