Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinished | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | |\ | |||||
| | | * | doc: v3 compatibility doc lists invalid config directive | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365 | ||||
| | | * | preparing for 5.10.1v5.10.1 | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | | |||||
| | | * | preparing for 5.10.0 releasev5.10.0 | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | |||||
| | | * | preparing for 5.9.7v5.9.7 | Rainer Gerhards | 2012-05-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge branch 'v5-stable-field-substring' into v5-beta | Rainer Gerhards | 2012-04-27 | 2 | -10/+19 |
| | | |\ | |||||
| | | | * | added capability to specify substrings for field extraction mode | Rainer Gerhards | 2012-04-27 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | preparing for 7.1.12 releasev7.1.12 | Rainer Gerhards | 2012-10-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | prepare for version 7.1.11v7.1.11 | Rainer Gerhards | 2012-10-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 2 | -26/+42 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | | | doc: improve module doc | Florian Riedl | 2012-10-19 | 1 | -26/+42 |
| | | | | | | |||||
| * | | | | | prepare for 7.3.1 releasev7.3.1 | Rainer Gerhards | 2012-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | imklog: add paramter "keepkerneltimestamp" | Rainer Gerhards | 2012-10-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marius Tomaschweski for the suggestion and a patch (for v5) that this commit bases on. | ||||
* | | | | | | imtcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -4/+7 |
| | | | | | | |||||
* | | | | | | imudp: support for Linux-like ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -0/+7 |
| | | | | | | |||||
* | | | | | | imptcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -7/+8 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-15 | 1 | -1/+18 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html | ||||
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2012-10-11 | 1 | -0/+17 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -0/+17 |
| | | | | | | |||||
| | * | | | | preparing for 7.1.10 releasev7.1.10 | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | prepare for 7.1.9 releasev7.1.9 | Rainer Gerhards | 2012-10-09 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | milestone: ratelimiter used in imptcp | Rainer Gerhards | 2012-10-15 | 1 | -2/+17 |
| | | | | | | |||||
* | | | | | | milestone: experimental rate limiter used in imuxsock | Rainer Gerhards | 2012-10-12 | 1 | -0/+22 |
|/ / / / / | |||||
* | | | | | preparing for 7.3.0 releasev7.3.0 | Rainer Gerhards | 2012-10-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'c1-streamzip' into master-streamzip | Rainer Gerhards | 2012-10-05 | 1 | -0/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c | ||||
| * | | | | | improved omfile zip writer to increase compression | Rainer Gerhards | 2012-09-14 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip. | ||||
| * | | | | | preparing for 5.8.13 releasev5.8.13 | Rainer Gerhards | 2012-08-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | preparing for 5.8.12v5.8.12 | Rainer Gerhards | 2012-06-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | omlibdbi improvements | Rainer Gerhards | 2012-10-04 | 1 | -18/+28 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * support for config load phases & module() parameters * support for default templates * driverdirectory is now cleanly a global parameter, but can no longer be specified as an action paramter. Note that in previous versions this parameter was ignored in all but the first action definition NOTE: more solid testing is needed for these changes. We spare this, as the module is scheduled for more work. This commit is more or less staging work. | ||||
* | | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
* | | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | doc: add missing files to distribution tarball | Rainer Gerhards | 2012-10-04 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for alerting me of the problem. | ||||
| * | | | | preparing for 6.4.2 releasev6.4.2 | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | prepare for 7.1.8 releasev7.1.8 | Rainer Gerhards | 2012-10-02 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: update module doc to new capabilities | Florian Riedl | 2012-10-02 | 6 | -64/+135 |
| | | | | | |||||
* | | | | | preparing for 7.1.7 releasev7.1.7 | Rainer Gerhards | 2012-10-01 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | doc: add SQL-template example | Tim Eifler | 2012-10-01 | 1 | -0/+29 |
| | | | | | |||||
* | | | | | preparing for 7.1.6 releasev7.1.6 | Rainer Gerhards | 2012-09-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-28 | 5 | -107/+373 |
|\ \ \ \ \ | |||||
| * | | | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | | | |||||
* | | | | | | preparing for 7.1.5v7.1.5 | Rainer Gerhards | 2012-09-26 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge remote-tracking branch 'milan/imkmsg' | Rainer Gerhards | 2012-09-24 | 1 | -0/+48 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation for new imkmsg module | Milan Bartos | 2012-09-24 | 1 | -0/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file: doc/imkmsg.html | ||||
* | | | | | | | doc: Improve template system doc | Rainer Gerhards | 2012-09-24 | 1 | -51/+151 |
|/ / / / / / | |||||
* | | | | | | Fiddeling a bit with the template doc | Florian Riedl | 2012-09-24 | 1 | -60/+111 |
| | | | | | | |||||
* | | | | | | Implement RainerScript prifield() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Implement RainerScript field() function | Rainer Gerhards | 2012-09-20 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -1/+4 |
|\| | | | | |