Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 1 | -25/+18 |
|\ | | | | | | | | | Conflicts: doc/imjournal.html | ||||
| * | doc: improve imjournal doc | Rainer Gerhards | 2013-06-17 | 1 | -17/+19 |
| | | | | | | | | most importantly, convert sample to new-style config format | ||||
| * | fix imjournal doc after merging patch | Rainer Gerhards | 2013-06-17 | 1 | -11/+2 |
| | | | | | | | | | | ... was changed in the interim, so the result of the merge was sub-optimal ;) | ||||
| * | Merge branch 'tmp' into v7-stable | Rainer Gerhards | 2013-06-17 | 1 | -0/+11 |
| |\ | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| | * | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
| * | | doc bugfix: DynaFileCacheSize description in omfile was wrong | Rainer Gerhards | 2013-06-16 | 1 | -2/+6 |
| | | | | | | | | | | | | thanks to David Lang for alerting me. | ||||
| * | | doc: add journal presentation link to omjournal doc | Rainer Gerhards | 2013-06-16 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'tmp' | Rainer Gerhards | 2013-06-17 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: plugins/imjournal/imjournal.c | ||||
| * | | | Rename legacy imjournal configs to have "imjournal" prepended. | Milan Bartos | 2013-06-17 | 1 | -0/+11 |
| | |/ | |/| | | | | | | | | | | modified: doc/imjournal.html modified: plugins/imjournal/imjournal.c | ||||
* | | | doc bugfix: DynaFileCacheSize description in omfile was wrong | Rainer Gerhards | 2013-06-16 | 1 | -2/+6 |
| | | | | | | | | | | | | thanks to David Lang for alerting me. | ||||
* | | | doc: add journal presentation link to omjournal doc | Rainer Gerhards | 2013-06-16 | 1 | -0/+3 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-16 | 1 | -8/+56 |
|\ \ \ | | |/ | |/| | |||||
| * | | doc: improve imjournal doc and add ratelimiting paramters | Rainer Gerhards | 2013-06-16 | 1 | -8/+56 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -0/+8 |
|\| | | |||||
| * | | doc: warn about using imjournal | Rainer Gerhards | 2013-06-15 | 1 | -0/+8 |
| | | | | | | | | | | | | do to bugs in systemd, the module can lead to a DoS to the local machine | ||||
| * | | doc bugfix: imrelp does not have a v6+ "ruleset" config parameter | Rainer Gerhards | 2013-06-10 | 1 | -4/+2 |
| |/ | |||||
* | | omrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 2 | -0/+15 |
| | | |||||
* | | imrelp: add capability to directly specify GnuTLS priority string | Rainer Gerhards | 2013-06-12 | 1 | -0/+11 |
| | | |||||
* | | imrelp: new parameter "compression.dhbits" | Rainer Gerhards | 2013-06-12 | 1 | -0/+10 |
| | | | | | | | | | | which controls the number of bits being used for Diffie-Hellman key generation | ||||
* | | Merge branch 'master-tcp-compress-stream' | Rainer Gerhards | 2013-06-12 | 2 | -1/+37 |
|\ \ | |||||
| * | | doc: more on tcp compression modes | Rainer Gerhards | 2013-06-12 | 2 | -0/+7 |
| | | | |||||
| * | | document new tcp compression mode | Rainer Gerhards | 2013-06-12 | 1 | -1/+30 |
| | | | |||||
* | | | prepare 7.5.0 releasev7.5.0 | Rainer Gerhards | 2013-06-11 | 1 | -1/+1 |
| | | | |||||
* | | | imrelp: implement "ruleset" module parameter | Rainer Gerhards | 2013-06-10 | 1 | -6/+8 |
| | | | |||||
* | | | add minimal doc for contributed mmcount module | Rainer Gerhards | 2013-06-09 | 2 | -0/+59 |
| | | | |||||
* | | | [io]mrelp: add TLS compression support | Rainer Gerhards | 2013-06-07 | 2 | -2/+16 |
| | | | |||||
* | | | Merge branch 'nextmaster' | Rainer Gerhards | 2013-06-06 | 2 | -4/+10 |
|\ \ \ | |_|/ |/| | | | | | | | | Conflicts: ChangeLog | ||||
| * | | doc: describe relp tls parameters | Jan Gerhards | 2013-05-15 | 2 | -4/+10 |
| | | | |||||
* | | | prepare for 7.4.0 releasev7.4.0 | Rainer Gerhards | 2013-06-05 | 1 | -1/+1 |
| | | | |||||
* | | | doc: correct omfile documentation | Tomas Heinrich | 2013-06-03 | 1 | -6/+6 |
| | | | | | | | | | | | | Some of the options affect all files, not just dynafiles. | ||||
* | | | doc: clarify RSYSLOG_DEBUG format | Tomas Heinrich | 2013-06-03 | 1 | -0/+1 |
| | | | |||||
* | | | doc bugfix: ReadMode wrong in imfile doc, two values were swapped | Rainer Gerhards | 2013-05-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=450 Thanks to jokajak@gmail.com for mentioning this | ||||
* | | | prepare for 7.3.15 releasev7.3.15 | Rainer Gerhards | 2013-05-14 | 1 | -1/+1 |
| | | | |||||
* | | | doc: integrate imjournal doc contribution into rest of doc system | Rainer Gerhards | 2013-05-14 | 3 | -1/+4 |
| | | | |||||
* | | | Added a bit of imjournal documentation. | Milan Bartos | 2013-05-14 | 1 | -0/+44 |
|/ / | | | | | | | new file: imjournal.html | ||||
* / | doc: unify statement format in legacy stmt doc | Jan Gerhards | 2013-05-10 | 1 | -95/+95 |
|/ | |||||
* | prepare for 7.3.14 releasev7.3.14 | Rainer Gerhards | 2013-05-06 | 1 | -1/+1 |
| | |||||
* | prepare for 7.3.13 release | Rainer Gerhards | 2013-04-29 | 1 | -1/+1 |
| | |||||
* | doc bugfix: omfile parameter "VeryRobustZip" was documentas as "VeryReliableZip" | Rainer Gerhards | 2013-04-26 | 1 | -1/+1 |
| | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=437 Thanks to Thomas Doll for reporting this. | ||||
* | prepare for 7.3.12 releasev7.3.12 | Rainer Gerhards | 2013-04-26 | 1 | -1/+1 |
| | |||||
* | doc: fix broken link | Rainer Gerhards | 2013-04-25 | 1 | -1/+1 |
| | | | | Thanks to Erik Steffl for alterting us. | ||||
* | doc: link new omelasticsearch doc to the module doc | Rainer Gerhards | 2013-04-24 | 1 | -0/+1 |
| | |||||
* | initial documentation for the Elasticsearch output module | Radu Gheorghe | 2013-04-24 | 1 | -0/+177 |
| | |||||
* | doc: wrong parameter name in omfwd doc | Rainer Gerhards | 2013-04-24 | 1 | -1/+1 |
| | |||||
* | some minor additions to 7.3.11v7.3.11 | Rainer Gerhards | 2013-04-23 | 1 | -2/+20 |
| | |||||
* | prepare for 7.3.11 release | Rainer Gerhards | 2013-04-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v7-stable' | Rainer Gerhards | 2013-04-17 | 1 | -9/+78 |
|\ | |||||
| * | doc: further improve action doc | Rainer Gerhards | 2013-04-17 | 1 | -107/+60 |
| | | |||||
| * | doc: improve action doc | Florian Riedl | 2013-04-17 | 1 | -1/+117 |
| | | |||||
* | | Merge branch 'master-crypto' | Rainer Gerhards | 2013-04-17 | 3 | -2/+128 |
|\ \ | | | | | | | | | | | | | Conflicts: ChangeLog |