summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Expand)AuthorAgeFilesLines
* Add support for optional JSON fieldsHEADommongodbMiloslav Trmač2012-08-281-0/+4
* Add OMSR_TPL_AS_FIELDS mode for output modules.Miloslav Trmač2012-08-281-0/+3
* INCOMPATIBLE: use :, not =, as separator for jsonfMiloslav Trmač2012-08-261-1/+1
* Merge branch 'v6-stable'Rainer Gerhards2012-08-251-1/+1
|\
| * preparing for 6.4.0 releaseRainer Gerhards2012-08-201-1/+1
* | update documentation for parsing trusted propertiesMilan Bartos2012-08-211-0/+2
* | doc: improved doc for built-in modulesFlorian Riedl2012-07-247-24/+443
* | Merge branch 'beta'Rainer Gerhards2012-07-241-1/+1
|\ \ | |/
| * preparing for 6.3.12v6.3.12Rainer Gerhards2012-07-021-1/+1
* | Merge branch 'beta' into master-moduleRainer Gerhards2012-06-291-1/+1
|\ \ | |/
| * preparing for 6.3.11v6.3.11Rainer Gerhards2012-06-181-1/+1
* | doc: typo fixRainer Gerhards2012-06-251-1/+1
* | ompipe: support for module() global config parameters addedRainer Gerhards2012-06-251-0/+10
* | Merge branch 'beta'Rainer Gerhards2012-06-041-1/+1
|\ \ | |/
| * preparing for 6.3.10Rainer Gerhards2012-06-041-1/+1
* | change action queue default enqueue timeout from 2000ms to 50msRainer Gerhards2012-06-011-0/+9
|/
* preparing for 6.3.9 (beta) releasev6.3.9Rainer Gerhards2012-05-221-1/+1
* Merge branch 'v6-stable'Rainer Gerhards2012-05-031-10/+10
|\
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-10/+10
| |\
| | * preparing for 5.8.11 releasev5.8.11Rainer Gerhards2012-05-031-1/+1
| | * doc: correcting sample section of omudpspoofRainer Gerhards2012-04-201-8/+8
| | * doc: omudpspoof doc had invalid directivesRainer Gerhards2012-04-201-2/+2
* | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-261-0/+9
* | | added the "jsonf" property replacer option (and fieldname) & bugfixRainer Gerhards2012-04-191-3/+27
* | | Merge branch 'v6-stable'Rainer Gerhards2012-04-181-0/+4
|\ \ \ | |/ /
| * | doc: added new $uptime propertyRainer Gerhards2012-04-131-0/+4
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-122-9/+1
| |\ \ | | |/
* | | Merge branch 'v5-beta'Rainer Gerhards2012-04-124-15/+10
|\ \ \
| * | | preparing for 5.9.6v5.9.6Rainer Gerhards2012-04-122-6/+9
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-122-9/+1
| |\ \ \
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-122-9/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-112-9/+1
* | | | | Merge branch 'v5-devel'Rainer Gerhards2012-04-071-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | permit size modifiers (k,m,g,...) in integer config parametersRainer Gerhards2012-04-071-2/+2
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-04-072-0/+18
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-201-0/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-191-0/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-122-2/+14
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-075-2/+39
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-071-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-1/+6
| |\ \ \ \ \ \ \
| * | | | | | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-0/+13
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-201-0/+6
| | |_|_|_|/ / | |/| | | | |
| * | | | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-191-0/+6
| | |_|_|/ / | |/| | | |
| * | | | | added capability to use a local interface IP address as fromhost-ip for imklogRainer Gerhards2012-03-102-1/+6
| * | | | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-1/+6
| * | | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-03-051-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-241-1/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'v6-stable'Rainer Gerhards2012-04-071-0/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-071-0/+5
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |