summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | mmfields/milestone: fields properly extractedRainer Gerhards2013-06-071-4/+50
| * | | | mmfields: created skeleton for new module; build system integrationRainer Gerhards2013-06-074-0/+235
* | | | | prepare 7.5.0 releasev7.5.0Rainer Gerhards2013-06-113-3/+3
* | | | | imuxsock: don't report an error message for $OmitLocalLoggingTomas Heinrich2013-06-101-0/+4
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-06-104-16/+76
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | doc bugfix: imrelp does not have a v6+ "ruleset" config parameterRainer Gerhards2013-06-101-4/+2
| * | | | doc: add contributed patches to ChangeLogRainer Gerhards2013-06-101-0/+4
| * | | | bugfix: prevent an endless loop in the ratelimiterTomas Heinrich2013-06-101-2/+2
| * | | | bugfix: be more tolerant to malformed journal fieldsTomas Heinrich2013-06-101-1/+8
| * | | | bugfix imzmq3: potential segfault on startupHongfei Cheng2013-06-062-13/+62
* | | | | imrelp: implement "ruleset" module parameterRainer Gerhards2013-06-103-11/+65
* | | | | add minimal doc for contributed mmcount moduleRainer Gerhards2013-06-092-0/+59
* | | | | mmcount: message modification plugin which counts messagesBala.FA2013-06-095-0/+384
| |/ / / |/| | |
* | | | [io]mrelp: add TLS compression supportRainer Gerhards2013-06-076-5/+40
* | | | Merge branch 'nextmaster'Rainer Gerhards2013-06-0624-117/+739
|\ \ \ \ | |/ / / |/| | |
| * | | doc: describe relp tls parametersJan Gerhards2013-05-152-4/+10
| * | | fix handling of unbounded blocksRainer Gerhards2013-05-161-1/+2
| * | | fix regression on unencrypted queue filesRainer Gerhards2013-05-161-0/+2
| * | | cleanupRainer Gerhards2013-05-163-7/+6
| * | | complete handle multiple blocks in encrypted queue filesRainer Gerhards2013-05-166-37/+146
| * | | properly handle padding bytes when reading queue filesRainer Gerhards2013-05-161-5/+10
| * | | enable ability to read existing encrypted queue fileRainer Gerhards2013-05-152-3/+28
| * | | clean up crypto provider state files on queue file rolloverRainer Gerhards2013-05-155-4/+29
| * | | do not try to write to read-open encryption state fileRainer Gerhards2013-05-152-5/+7
| * | | clean up crypto provider state files on queue file closeRainer Gerhards2013-05-156-2/+40
| * | | omrelp: add "rebindInterval" parameterRainer Gerhards2013-05-142-5/+27