summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* minor cleanupRainer Gerhards2012-12-143-3/+13
* Merge branch 'master-optimize-facilitext'Rainer Gerhards2012-12-143-25/+371
|\
| * script optimizer: support textual severities in compare operations as wellRainer Gerhards2012-12-111-0/+17
| * script optimizer: support numerical facilities in compare operations as wellRainer Gerhards2012-12-111-5/+58
| * script optimizer: severity lt/le/gt/ge to prifilt()Rainer Gerhards2012-12-111-16/+46
| * script optimizer: severity eq/ne to prifilt()Rainer Gerhards2012-12-111-5/+37
| * bugfix: optimizer stopped prematurely on some operationsRainer Gerhards2012-12-111-0/+11
| * script optimizer: optimize and/or on PRI filtersRainer Gerhards2012-12-111-0/+37
| * script optimizer: support NOT pri matchesRainer Gerhards2012-12-111-4/+42
| * enhance optimizer: detect eq-comparison for syslog facilityRainer Gerhards2012-12-113-20/+148
* | Merge branch 'v7-stable'Rainer Gerhards2012-12-134-23/+19
|\ \
| * | doc: mention recent patches in ChangeLogRainer Gerhards2012-12-131-0/+7
| * | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-12-132-1/+5
| |\ \
| | * \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-12-132-1/+5
| | |\ \
| | | * | bugfix: invalid DST handling under SolarisScott Severtson2012-12-132-1/+3
| * | | | build: link omelasticsearch against -lmMichael Biebl2012-12-132-1/+2
| * | | | build: drop obsolete --enable-pthreads configure switchMichael Biebl2012-12-131-18/+2
| * | | | build: fix uuid configure checkMichael Biebl2012-12-131-3/+3
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-12-071-1/+1
|\| | | |
| * | | | prepare for 7.2.4v7.2.4Rainer Gerhards2012-12-073-3/+3
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-12-071-0/+15
|\| | | |
| * | | | doc: mention important up-merged patch in ChangeLogRainer Gerhards2012-12-071-0/+15
* | | | | cosmetic: give testbench test a bit more time for slow machinesRainer Gerhards2012-12-061-0/+1
* | | | | doc: mention msg obj changes in ChangeLogRainer Gerhards2012-12-061-1/+15
* | | | | Merge branch 'v7-stable-newmsglock' into master-newmsglockRainer Gerhards2012-12-0617-238/+300
|\| | | | | |_|_|/ |/| | |
| * | | Merge branch 'v6-stable-newmsglock' into v7-stable-newmsglockRainer Gerhards2012-12-065-167/+24
| |\| |
| | * | bugfix: some message properties could be garbled due to race conditionRainer Gerhards2012-12-066-169/+26
| * | | permit RFC3339 timestamp in local log socket messagesSebastien Ponce2012-12-032-3/+9
| * | | fix missing functionality: ruleset(){} could not specify ruleset queueRainer Gerhards2012-11-309-63/+151
| * | | silence compiler warningsRainer Gerhards2012-11-305-8/+29
| * | | fix display problem with some date-format template optionsRainer Gerhards2012-11-291-1/+7
* | | | bugfix[minor]: invalid error code when mmnormalize could not access rulebaseRainer Gerhards2012-11-303-3/+6
* | | | cleanupRainer Gerhards2012-11-301-1/+0
* | | | bugfix: segfault on imuxsock startup if system log socket is used and no rate...Rainer Gerhards2012-11-292-0/+7
* | | | doc bugfix: corrections and improvements in mmnormalize html doc pageFlorian Riedl2012-11-292-11/+14
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-292-4/+6
|\| | |
| * | | bugfix: template "type" parameter is mandatory (but was not)Rainer Gerhards2012-11-292-4/+6
* | | | refactor error processing in string template handlingRainer Gerhards2012-11-292-44/+31
* | | | bugfix: error message had an extra LF in it (can break forwarding & tools)Rainer Gerhards2012-11-291-1/+1
* | | | bugfix: no error message for invalid string template parametersRainer Gerhards2012-11-294-4/+28
* | | | bugfix: mmnormalize could abort rsyslog if config parameter was in errorRainer Gerhards2012-11-282-1/+6
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-2816-18/+52
|\| | |
| * | | silence some primarily cosmetic compiler warning messagesRainer Gerhards2012-11-284-7/+22
| * | | bugfix: modules not (yet) supporting new conf format were not properly regist...Rainer Gerhards2012-11-2811-2/+16
| * | | doc: improve imptcp docRainer Gerhards2012-11-261-8/+10
| * | | bugfix: supportoctetcountedframing parameter did not work in imptcpRainer Gerhards2012-11-252-1/+2
* | | | bugfix: mmnormalize build problemsRainer Gerhards2012-11-272-6/+6
* | | | prepare 7.3.4 releasev7.3.4Rainer Gerhards2012-11-254-3/+16
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-222-0/+5
|\| | |
| * | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-222-0/+5
| |\| |