summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v7-stable'Rainer Gerhards2013-06-173-3/+22
|\
| * imjournal fix: put ratelimiter destruction in wrong entry pointRainer Gerhards2013-06-172-2/+2
| * implement new ratelimiting mode for imjournalRainer Gerhards2013-06-173-1/+20
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-2/+2
|\|
| * doc: legacy parameter description in imjournal slightly wrongRainer Gerhards2013-06-171-2/+2
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-9/+41
|\|
| * doc cleanupRainer Gerhards2013-06-171-5/+5
| * Add IgnorePreviousMessages option to imjournal.Milan Bartos2013-06-172-9/+41
* | Merge branch 'v7-stable'Rainer Gerhards2013-06-171-25/+18
|\|
| * doc: improve imjournal docRainer Gerhards2013-06-171-17/+19
| * fix imjournal doc after merging patchRainer Gerhards2013-06-171-11/+2
| * Merge branch 'tmp' into v7-stableRainer Gerhards2013-06-172-3/+14
| |\
| | * Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
* | | Merge branch 'tmp'Rainer Gerhards2013-06-172-3/+14
|\ \ \
| * | | Rename legacy imjournal configs to have "imjournal" prepended.Milan Bartos2013-06-172-3/+14
| | |/ | |/|
* | | Merge branch 'v7-stable'Rainer Gerhards2013-06-160-0/+0
|\ \ \ | | |/ | |/|
| * | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
| * | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
* | | doc bugfix: DynaFileCacheSize description in omfile was wrongRainer Gerhards2013-06-161-2/+6
* | | doc: add journal presentation link to omjournal docRainer Gerhards2013-06-161-0/+3
* | | Merge branch 'v7-stable'Rainer Gerhards2013-06-161-8/+56
|\| |
| * | doc: improve imjournal doc and add ratelimiting paramtersRainer Gerhards2013-06-161-8/+56
* | | Merge branch 'v7-stable'Rainer Gerhards2013-06-151-0/+4
|\| |
| * | imjournal: add legacy config statement for ratelimitingRainer Gerhards2013-06-151-0/+4
* | | Merge branch 'v7-stable'Rainer Gerhards2013-06-152-8/+32
|\| |
| * | imjournal: add ratelimiting capabilityRainer Gerhards2013-06-152-8/+32
* | | Merge branch 'v7-stable'Rainer Gerhards2013-06-156-15/+46
|\| |
| * | doc: warn about using imjournalRainer Gerhards2013-06-151-0/+8
| * | doc: mention contributed patch in ChangeLogRainer Gerhards2013-06-141-0/+1
| * | bugfix: prevent a segfault if state file is not definedTomas Heinrich2013-06-141-12/+31
| * | systemd: use service type notifyCristian Rodríguez2013-06-142-0/+3
| * | Fix rsyslog.service to comply with systemd recommendationsCristian Rodríguez2013-06-141-1/+1
| * | bugfix: prevent calling tellLostCnt() twiceTomas Heinrich2013-06-121-1/+1
| * | bugfix: prevent another endless loop in the ratelimiterTomas Heinrich2013-06-121-1/+1
* | | cleanupRainer Gerhards2013-06-141-1/+0
* | | [io]mrelp: support for certificate parametersRainer Gerhards2013-06-132-0/+46
* | | omrelp: add capability to directly specify GnuTLS priority stringRainer Gerhards2013-06-125-1/+30
* | | imrelp: add capability to directly specify GnuTLS priority stringRainer Gerhards2013-06-122-0/+17
* | | imrelp: new parameter "compression.dhbits"Rainer Gerhards2013-06-124-1/+22
* | | add BSD-specific syslog facilitiesRainer Gerhards2013-06-122-0/+7
* | | doc: add new feature to ChangeLogRainer Gerhards2013-06-121-0/+3
* | | Merge branch 'master-tcp-compress-stream'Rainer Gerhards2013-06-124-26/+345
|\ \ \
| * | | doc: more on tcp compression modesRainer Gerhards2013-06-122-0/+7
| * | | document new tcp compression modeRainer Gerhards2013-06-121-1/+30
| * | | Merge branch 'master' into master-tcp-compress-streamRainer Gerhards2013-05-0732-100/+1005
| |\ \ \
| * | | | tcp strm compression: add stats countersRainer Gerhards2013-04-181-5/+23
| * | | | tcp strm compression: add config parametersRainer Gerhards2013-04-182-16/+91
| * | | | tcp strm compression: first PoCRainer Gerhards2013-04-182-17/+207
* | | | | Merge branch 'master-mmfields'Rainer Gerhards2013-06-114-1/+293
|\ \ \ \ \
| * | | | | mmfields: store parsed-out fields in rsyslog dictionaryRainer Gerhards2013-06-091-2/+13