Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | preparing for 6.2.1v6.2.1 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-05-03 | 1 | -10/+10 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | preparing for 5.8.11 releasev5.8.11 | Rainer Gerhards | 2012-05-03 | 1 | -1/+1 |
| | | |||||
| * | doc: correcting sample section of omudpspoof | Rainer Gerhards | 2012-04-20 | 1 | -8/+8 |
| | | | | | | | | again, credits to Jo Rhett for reporting this issue | ||||
| * | doc: omudpspoof doc had invalid directives | Rainer Gerhards | 2012-04-20 | 1 | -2/+2 |
| | | | | | | | | Thanks to Jo Rhett for reporting the bug. | ||||
* | | doc: added new $uptime property | Rainer Gerhards | 2012-04-13 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-12 | 2 | -9/+1 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | bugfix: hostname was not requeried on HUP | Rainer Gerhards | 2012-04-11 | 2 | -9/+1 |
| | | | | | | | | Thanks to Marius Tomaschewski for reporting this bug. | ||||
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-04-07 | 1 | -0/+5 |
|\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | preparing for 5.8.10v5.8.10 | Rainer Gerhards | 2012-04-07 | 1 | -1/+1 |
| | | |||||
| * | doc: noted disk queue format change from v4->v5 | Rainer Gerhards | 2012-04-05 | 1 | -0/+5 |
| | | |||||
| * | preparing for 5.8.9v5.8.9 | Rainer Gerhards | 2012-03-15 | 1 | -1/+1 |
| | | |||||
| * | preparing for 5.8.8v5.8.8 | Rainer Gerhards | 2012-03-05 | 1 | -1/+1 |
| | | |||||
| * | preparing for 5.8.7v5.8.7 | Rainer Gerhards | 2012-01-17 | 1 | -1/+1 |
| | | |||||
* | | final prep for 6.2.0v6.2.0 | Rainer Gerhards | 2012-01-09 | 1 | -1/+1 |
| | | |||||
* | | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 4 | -43/+2 |
| | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. ------------------------- | ||||
* | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
|\| | |||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| |\ | |||||
| | * | added doc for omprog | Rainer Gerhards | 2011-12-16 | 2 | -0/+44 |
| | | | |||||
* | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-12-01 | 1 | -3/+2 |
|\| | | |||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| |\| | |||||
| | * | doc bugfix: typo in imgssapi doc | Rainer Gerhards | 2011-11-03 | 1 | -3/+2 |
| | | | |||||
* | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
|\| | | |||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| |\| | |||||
| | * | doc: imfile: clarified that empty lines are not processed | Rainer Gerhards | 2011-10-25 | 1 | -1/+3 |
| | | | |||||
| * | | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html | ||||
| * | | 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 |
| | | | |||||
* | | | bugfix (kind of): removed numerical part from pri-text | Rainer Gerhards | 2011-10-21 | 2 | -25/+68 |
| | | | | | | | | | | | | see v6 compatibility document for reasons | ||||
* | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-17 | 1 | -0/+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 |
| | | | | | |||||
* | | | | | preparing for 6.1.12 releasev6.1.12 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | | | | 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 6.1.11v6.1.11 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-07-11 | 4 | -6/+21 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | | 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 |
| | | | | |