summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-293-2/+3
|\
| * property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
| * omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-251-0/+1
| * Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2312-159/+438
| |\
| * | permitting plugins to use three string requestsRainer Gerhards2012-04-132-4/+8
| * | omelasticsearch: used new property replacer options for default templateRainer Gerhards2012-04-051-1/+1
* | | improve invalid config command error messageRainer Gerhards2012-06-271-1/+2
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-111-4/+13
|\ \ \
| * \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-111-4/+8
| |\ \ \
| | * | | bugfix: "last message repeated n times" message was missing hostnameRainer Gerhards2012-06-111-4/+8
| * | | | bugfix: did not compile under solaris due to $uptime property codeRainer Gerhards2012-06-081-0/+5
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-065-33/+26
| |\| | |
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-013-13/+17
| |\ \ \ \
* | \ \ \ \ Merge branch 'v5-beta' into betaRainer Gerhards2012-06-065-33/+26
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-065-33/+26
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | bugfix: property PROCID was empty instead of proper nilvalue if not presentRainer Gerhards2012-06-061-1/+1
| | * | | | | bugfix: potential hang due to mutex deadlockRainer Gerhards2012-06-063-29/+10
| | * | | | | fixing memleak in recent group resolve patchRainer Gerhards2012-06-061-3/+6
| | * | | | | call getgrnam_r repeatedly to get all group members.Alec Warner2012-06-061-3/+12
| | | |/ / / | | |/| | |
* | | | | | fixing small memleak during config read phaseRainer Gerhards2012-06-051-0/+1
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-06-011-10/+16
|\| | | | |
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-011-10/+16
| |\| | | |
| | * | | | some better code to handle queue congestionRainer Gerhards2012-06-011-10/+15
* | | | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-292-3/+2
|\| | | | |
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-292-3/+2
| |\| | | |
| | * | | | bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-292-3/+2
| * | | | | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-101-11/+5
* | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-101-11/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-101-11/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-101-11/+5
| * | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-101-13/+0
| |\| | | |
* | | | | | Merge branch 'v5-beta'Rainer Gerhards2012-05-101-13/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-13/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-13/+0
| * | | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-031-7/+47
| |\| | | |
| * | | | | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-271-55/+57
| |\ \ \ \ \
| | * | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-271-55/+57
| * | | | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-183-5/+41
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-183-5/+41
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-05-031-6/+47
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-7/+47
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-031-5/+42
| | * | | | | | | bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-031-5/+4
| | * | | | | | | bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-271-0/+4
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-021-1/+2
* | | | | | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-55/+57
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-37/+93
* | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-184-5/+64
|\| | | | | |
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-183-8/+41
| |\| | | | |
| | * | | | | fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | |_|/ / | | |/| | |