| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | preparing for 7.3.5 release | Rainer Gerhards | 2012-12-18 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'v7-stable-libnet-frag' | Rainer Gerhards | 2012-12-18 | 2 | -30/+145 |
| |\ | | | | | | | | | | | | | | | Conflicts: configure.ac plugins/impstats/impstats.c plugins/omudpspoof/omudpspoof.c runtime/rsyslog.h | ||||
| | * | omudpspoof: improve libnet calling sequence | Rainer Gerhards | 2012-12-18 | 1 | -0/+4 |
| | | | | | | | | | retains bugfix while increasing performance again | ||||
| | * | doc: added v7 conf samples to omudpspoof doc | Rainer Gerhards | 2012-12-18 | 1 | -5/+77 |
| | | | |||||
| | * | omudpspoof: add action parameter for mtu size | Rainer Gerhards | 2012-12-18 | 1 | -1/+1 |
| | | | |||||
| | * | doc: document v7 omudpspoof config parameters | Rainer Gerhards | 2012-12-17 | 1 | -26/+60 |
| | | | |||||
| | * | doc: mention omudpspoof message size limits | Rainer Gerhards | 2012-12-17 | 1 | -0/+5 |
| | | | |||||
| | * | prepare for 7.2.4v7.2.4 | Rainer Gerhards | 2012-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | doc bugfix: corrections and improvements in mmnormalize html doc page | Florian Riedl | 2012-11-29 | 1 | -11/+13 |
| | | | |||||
| * | | bugfix: no error message for invalid string template parameters | Rainer Gerhards | 2012-11-29 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | rather a malformed template was generated, and error information emitted at runtime. However, this could be quite confusing. Note that with this "bugfix" user experience changes: formerly, rsyslog and the affected actions properly started up, but the actions did not produce proper data. Now, there are startup error messages and the actions are NOT executed (due to missing template due to template error). | ||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-28 | 1 | -8/+14 |
| |\| | | | | | | | | | | | | | Conflicts: doc/imptcp.html plugins/mmjsonparse/mmjsonparse.c plugins/mmnormalize/mmnormalize.c | ||||
| | * | doc: improve imptcp doc | Rainer Gerhards | 2012-11-26 | 1 | -8/+10 |
| | | | |||||
| * | | prepare 7.3.4 releasev7.3.4 | Rainer Gerhards | 2012-11-25 | 1 | -1/+1 |
| | | | |||||
| * | | doc: add new options to imklog doc page | Marius Tomaschewski | 2012-11-22 | 1 | -21/+19 |
| | | | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-22 | 1 | -0/+13 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2012-11-22 | 1 | -0/+13 |
| | |\ | |||||
| | | * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-22 | 1 | -0/+13 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | | | * | imklog: added $klogParseKernelTimestamp option | Marius Tomaschewski | 2012-11-21 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time. | ||||
| | | | * | imklog: added $klogKeepKernelTimestamp option | Marius Tomaschewski | 2012-11-21 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too. | ||||
| | * | | | prepare for 7.2.3 releasev7.2.3 | Rainer Gerhards | 2012-11-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | prepare 7.2.2 releasev7.2.2 | Rainer Gerhards | 2012-11-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-14 | 1 | -3/+8 |
| |\| | | | |||||
| | * | | | doc: describe leading space problem with "startswith" comparison | Rainer Gerhards | 2012-11-14 | 1 | -3/+8 |
| | | | | | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-13 | 3 | -98/+227 |
| |\| | | | |||||
| | * | | | doc: upgrade ruleset doc to v7 config system | Konstantin Schmitt | 2012-11-12 | 3 | -98/+227 |
| | | | | | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-08 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | doc: $ActionQueueDiscardSeverity had wrong default documented | Rainer Gerhards | 2012-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | The doc contained a previous default, which has been changed in the mean time. | ||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-08 | 1 | -2/+4 |
| |\| | | | |||||
| | * | | | Added imkmsg^imklog to imkmsg documentation. | Milan Bartos | 2012-11-05 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | prepare for 7.3.3 releasev7.3.3 | Rainer Gerhards | 2012-11-07 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | doc: improve ommongodb doc | Rainer Gerhards | 2012-11-06 | 2 | -0/+61 |
| | | | | | |||||
| * | | | | doc: add module doc for mmjsonparse | Rainer Gerhards | 2012-11-01 | 3 | -0/+48 |
| | | | | | |||||
| * | | | | typo fix | Rainer Gerhards | 2012-11-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | mmnormalize: support for v6+ config interface added | Rainer Gerhards | 2012-11-01 | 1 | -7/+21 |
| | | | | | |||||
| * | | | | prepare for 7.3.2 releasev7.3.2 | Rainer Gerhards | 2012-10-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master-ratelimit' | Rainer Gerhards | 2012-10-30 | 4 | -11/+59 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 1 | -0/+10 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html | ||||
| | * \ \ \ \ | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 2 | -26/+42 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | | | | 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 | ||||
| | * | | | | | | | | 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 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html | ||||
| | * | | | | | | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | ||||
| | * | | | | | | | | prepare for 7.2.1 releasev7.2.1 | Rainer Gerhards | 2012-10-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-10-27 | 1 | -2/+1 |
| |\| | | | | | | | | |_|_|_|_|/ / / |/| | | | | | | | |||||
| | * | | | | | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-10-25 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |