summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* property replacer lost one char when json escaping was necessaryRainer Gerhards2012-05-211-1/+1
* omelasticsearch: provide authentication support (UNTESTED)Rainer Gerhards2012-04-252-0/+29
* Merge branch 'master' into master-elasticsearchRainer Gerhards2012-04-2339-316/+825
|\
| * Merge branch 'v5-beta'Rainer Gerhards2012-04-191-0/+4
| |\
| | * Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
| | |\
| | | * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| | | |\
| | | | * doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| | | | * bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | * | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| | | * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | * | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-184-5/+45
| | |\| |
| | | * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-180-0/+0
| | | |\|
| | | * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| | | |\ \
| * | | | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-195-59/+181
| * | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-186-5/+76
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-184-8/+45
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | fixed compile bugRainer Gerhards2012-04-181-1/+1
| | | | |_|/ | | | |/| |
| | | * | | bugfix: assigned ruleset was lost when using disk queuesRainer Gerhards2012-04-184-8/+45
| | * | | | doc: added new $uptime propertyRainer Gerhards2012-04-131-0/+4
| | * | | | Add a system property, PROP_SYS_UPTIME, to place up-time markers into rsyslog...Steven A. Falco2012-04-132-0/+21
| * | | | | bugfix/imuxsock: configured hostname was not usedRainer Gerhards2012-04-162-1/+3
| * | | | | bugfix/imuxsock: solving abort if hostname was not setRainer Gerhards2012-04-162-2/+5
| * | | | | make "old" omelasticsearch compileRainer Gerhards2012-04-161-1/+0
| * | | | | preparing for 6.3.8 releasev6.3.8Rainer Gerhards2012-04-161-1/+1
| * | | | | bugfix: report error if module tries to request more strings than supportedRainer Gerhards2012-04-132-4/+8
| * | | | | imuxsock: mini bugfix: closed fd was tried to close a second timeRainer Gerhards2012-04-131-3/+6
| * | | | | Merge branch 'v6-stable'Rainer Gerhards2012-04-120-0/+0
| |\| | | |
| | * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-126-136/+171
| | |\| | |
| * | | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-129-138/+210
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-124-9/+15
| | * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-126-120/+168
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-126-120/+168
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | imuxsock: do not cache hostnameRainer Gerhards2012-04-122-11/+5
| | | | * | Free also LocalDomain in glbl class destructorMarius Tomaschewski2012-04-111-0/+1
| | | | * | Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| | | | * | doc: credits update for last bugfixRainer Gerhards2012-04-111-1/+2
| | | | * | bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-115-125/+161
| * | | | | imuxsock: fixed regression from last mergeRainer Gerhards2012-04-111-0/+7
| * | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-075-35/+54
| |\| | | |
| | * | | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-073-33/+42
| | * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-0714-123/+370
| | |\| | |
| | * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-203-2/+23
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-199-10/+30
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-149-38/+69
| | |\ \ \ \ \ \
| | * | | | | | | cosmetic: removed stray definitionRainer Gerhards2012-03-121-1/+0
| | * | | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-1216-18/+176
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-022-2/+6
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-011-0/+9
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2012-03-018-63/+79
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | bugfix: imklog invalidly computed facility and severityRainer Gerhards2012-03-012-2/+6