summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: describe "CEE cookie" required by mmjsonparseRainer Gerhards2013-09-161-0/+10
| | | | ... as well as other format requirements.
* Merge branch 'v7-stable'Rainer Gerhards2013-09-162-1/+4
|\
| * bugfix: doc: imuxsock legacy param $SystemLogSocketParseTrusted was misspelledRainer Gerhards2013-09-162-1/+4
| | | | | | | | Thanks to David Lang for alerting us
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-132-2/+4
|\|
| * bugfix: small memory leak in imfile when $ResetConfigVariables was usedGrégory Nuyttens2013-09-132-2/+4
| | | | | | | | Thanks to Grégory Nuyttens for reporting this bug and providig a fix
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-134-3/+25
|\| | | | | | | | | Conflicts: runtime/rsyslog.h
| * bugfix: segfault on startup if TCP TLS was used but no cert or key setRainer Gerhards2013-09-133-1/+14
| |
| * Merge branch 'v7-stable' into v7-stable-tlsfixRainer Gerhards2013-09-13204-2928/+16887
| |\ | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | bugfix: segfault on startup if TLS was used but no CA cert setRainer Gerhards2013-09-134-2/+11
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-09-121-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c runtime/cryprov.h
| * | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabledRainer Gerhards2013-09-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem Conflicts: ChangeLog runtime/cryprov.h
| * | omelasticsearch: straighten out statistics countersRainer Gerhards2013-09-111-13/+13
| | | | | | | | | | | | | | | | | | Conflicts: plugins/omelasticsearch/omelasticsearch.c
* | | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabledRainer Gerhards2013-09-123-3/+5
| | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem
* | | omelasticsearch: straighten out statistics countersRainer Gerhards2013-09-111-13/+13
| | |
* | | preparing for 7.5.3 releasev7.5.3Rainer Gerhards2013-09-113-3/+3
| | |
* | | regression fix: message properties did not workRainer Gerhards2013-09-112-2/+2
| | | | | | | | | | | | | | | This was a regeression from the global/local variabe work done for this release. Consequently, this problem did not occur in any released version.
* | | omelasticsearch: adapt to new stats subsystem extensionsRainer Gerhards2013-09-101-4/+4
| | |
* | | doc: nit fixingRainer Gerhards2013-09-101-9/+8
| | |
* | | imrelp: adapt to new stats subsystem extensionsRainer Gerhards2013-09-101-1/+1
| | |
* | | doc: add queue parameter skeletonFlorian Riedl2013-09-101-0/+71
| | |
* | | doc: clarify global/local variablesRainer Gerhards2013-09-102-2/+3
| | |
* | | doc: add reference to relevant blog posting (imfile "escapeLF" param)Rainer Gerhards2013-09-102-1/+3
| | |
* | | doc: clarify imfile "escapeLF" paramter availabilityRainer Gerhards2013-09-101-1/+1
| | |
* | | imfile: support LF escaping in read mode 2Rainer Gerhards2013-09-102-6/+29
| | |
* | | imfile: support LF escaping in read mode 1Rainer Gerhards2013-09-104-11/+42
| | |
* | | doc: add new impstats feature to ChangeLogRainer Gerhards2013-09-091-0/+2
| | |
* | | impstats: implement parameter "resetCounters"Rainer Gerhards2013-09-094-19/+39
| | | | | | | | | | | | | | | it provides the capability to make impstats emit deltas in contrast to accumulated counter values (see doc for details).
* | | impstats: reset stats counters no matter if CEE or regular mode is usedRainer Gerhards2013-09-091-3/+17
| | |
* | | experimental: make impstats return delta values where possibleRainer Gerhards2013-09-0710-33/+41
| | |
* | | imudp: use inputname for statistics, if configuredRainer Gerhards2013-09-052-3/+4
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-09-053-3/+7
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | bugfix: some more build problems with newer json-c versionsRainer Gerhards2013-09-043-2/+6
| | | | | | | | | | | | Thanks to Michael Biebl for mentioning the problem.
| * | prepare for 7.4.4 releasev7.4.4Rainer Gerhards2013-09-033-3/+3
| | |
* | | doc: mention imported patches in ChangeLogRainer Gerhards2013-09-031-0/+1
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-09-032-1/+9
|\| |
| * | doc: add some more non-mentioned fixes to ChangeLogRainer Gerhards2013-09-031-0/+4
| | |
| * | regression fix: previous fix introduced wrong default templateRainer Gerhards2013-09-031-1/+1
| | | | | | | | | | | | The faulty code was never released.
| * | doc: add missing information (patches) to ChangeLogRainer Gerhards2013-09-031-0/+4
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-09-0313-15/+20
|\| |
| * | doc: mention last json-c patch in ChangeLogRainer Gerhards2013-09-031-0/+2
| | |
| * | make rsyslog use the new json-c pkgconfig file if availablehwoarang2013-09-0312-15/+18
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-09-022-1/+4
|\| |
| * | bugfix: imfile parameter "persistStateInterval" was unusableRainer Gerhards2013-09-022-1/+4
| | | | | | | | | | | | | | | due to a case typo in imfile; work-around was to use legacy config Thanks to Brandon Murphy for reporting this bug.
* | | Merge branch 'v7-stable'Rainer Gerhards2013-09-025-9/+24
|\| |
| * | doc: add recent patch series to ChangeLogRainer Gerhards2013-09-021-0/+8
| | |
| * | Using more appropriate helper function to get the error messageAhto Truu2013-09-021-1/+1
| | |
| * | Better error messages from rsgtutilAhto Truu2013-09-021-4/+4
| | |
| * | More careful TLV encoding/decodingAhto Truu2013-09-023-4/+11
| | |
* | | Merge branch 'c9'Rainer Gerhards2013-09-0210-4/+64
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c
| * | | doc: add "defaultTZ" param to imtcp docRainer Gerhards2013-09-021-2/+13
| | | |