Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-20 | 2 | -5/+5 |
|\ | |||||
| * | doc bugfix: pri-text neees to be fixed in an article as well | Rainer Gerhards | 2011-10-20 | 1 | -3/+3 |
| | | |||||
| * | doc bug: property pri-text was incorrectly described | Rainer Gerhards | 2011-10-20 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
|\| | |||||
| * | doc: clarified that imklog does not support Solaris | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0 | Rainer Gerhards | 2011-09-07 | 14 | -22/+348 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html | ||||
| | * | preparing for 4.7.5 releasev4.7.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | |||||
| | * | preparing for 4.7.4v4.7.4 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | |||||
| | * | issue a warning message for old-style dynafile action | Rainer Gerhards | 2011-07-11 | 1 | -0/+19 |
| | | | |||||
| | * | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 4 | -10/+17 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * \ | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-05-09 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tcpsrv.c tests/Makefile.am tests/tcpflood.c | ||||
| * | | | | preparing for 4.6.8 releasev4.6.8 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | preparing for 5.8.5 releasev5.8.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | minor doc: made body tag parsable for web site scripts | Rainer Gerhards | 2011-08-12 | 1 | -2/+2 |
| | | | | |||||
* | | | | preparing for version 5.8.4v5.8.4 | root | 2011-08-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | preparing for 5.8.3v5.8.3 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | added warning message for old-style outchannel syntax | Rainer Gerhards | 2011-07-11 | 1 | -0/+19 |
| | | | | |||||
* | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-11 | 2 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh | ||||
| * | | | preparing for 4.6.7 releasev4.6.7 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | support for :omfile: forward compatibility directive | Rainer Gerhards | 2011-07-11 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-07-06 | 2 | -8/+14 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | added support for the ":omusrmsg:" syntax in configuring user messages | Rainer Gerhards | 2011-07-06 | 1 | -7/+13 |
| | | | | |||||
| * | | | preparing for 4.6.6v4.6.6 | Rainer Gerhards | 2011-06-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | preparing for 5.8.2 | Rainer Gerhards | 2011-06-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-06-15 | 1 | -1/+15 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_conf_global.html | ||||
| * | | | doc: clarified requirements for $WorkDirectory directive | Rainer Gerhards | 2011-06-15 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | preparing for 5.8.1 stablev5.8.1 | Rainer Gerhards | 2011-05-19 | 1 | -1/+1 |
| | | | |||||
* | | | mmsnmptrapd: added doc & mentioned in ChangeLog | Rainer Gerhards | 2011-05-10 | 3 | -0/+102 |
| | | | |||||
* | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-04-15 | 1 | -0/+1 |
|\| | | |||||
| * | | bugfix: IPv6-address could not be specified in omrelp | Rainer Gerhards | 2011-04-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250 | ||||
* | | | bugfix: doc for impstats had wrong config statements | Rainer Gerhards | 2011-04-14 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | also, config statements were named a bit inconsistent, resolved that problem by introducing an alias and only documenting the consistent statements Thanks to Marcin for bringing up this problem. | ||||
* | | | Merge branch 'v5-beta' into v5-stable | Rainer Gerhards | 2011-04-12 | 12 | -26/+232 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plus bump to new v5-stable Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | corrected ActionSendResendLastMsgOnReconnect docs | Marius Tomaschewski | 2011-04-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Marius Tomaschewski <mt@suse.de> | ||||
| * | | | doc bugfix: doc listed no-longer existing TLS limitations | Rainer Gerhards | 2011-04-01 | 1 | -16/+2 |
| | | | | |||||
| * | | | preparing for 5.7.10 | Rainer Gerhards | 2011-03-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | enhance: added $BOM system property to ease writing byte order masks | Rainer Gerhards | 2011-03-22 | 1 | -0/+6 |
| | | | | |||||
| * | | | some minor enhancements to doc set -- point to more examples | Rainer Gerhards | 2011-03-17 | 1 | -4/+7 |
| | | | | |||||
| * | | | preparing for 5.7.9v5.7.9 | Rainer Gerhards | 2011-03-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | preparing for 5.7.8 releasev5.7.8 | Rainer Gerhards | 2011-03-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-08 | 1 | -1/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tests/Makefile.am tools/syslogd.c | ||||
| * | | | | preparing for 5.7.7v5.7.7 | Rainer Gerhards | 2011-03-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | preparing for 5.7.6v5.7.6 | Rainer Gerhards | 2011-02-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | preparing for 5.7.5 release | Rainer Gerhards | 2011-02-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | enhance: imfile did not yet support multiple rulesets, now added | Rainer Gerhards | 2011-02-18 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we do this directly in the beta because a) it does not affect existing functionality and b) one may argue that this missing functionality is close to a bug. | ||||
| * | | | | preparing for 5.7.4 releasev5.7.4 | Rainer Gerhards | 2011-02-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | preparing for 5.7.3v5.7.3 | Rainer Gerhards | 2011-02-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | removed invalid link from doc | Rainer Gerhards | 2011-02-04 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | added doc for new ommysql directives | Ariel P | 2011-02-01 | 1 | -0/+12 |
| | | | | | |||||
| * | | | | enhanced imfile to support multi-line messages | David Lang | 2011-01-25 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 1 | -0/+6 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c |