summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* preparing for 5.9.6v5.9.5Rainer Gerhards2012-01-272-8/+4
* Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-273-3/+8
|\
| * bugfix: action stats did invalidly contain already-discarded messagesRainer Gerhards2012-01-272-4/+5
| * Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-244-3/+9
| |\
| | * mentioning license change in ChangeLogRainer Gerhards2012-01-211-0/+1
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-212-0/+3
| | |\
| | | * license docs were not properly redistributedRainer Gerhards2012-01-212-0/+3
* | | | imklog: forgot to remove one file; now doneRainer Gerhards2012-01-231-35/+0
* | | | refactored imklog linux driver, now combined with BSD driverRainer Gerhards2012-01-239-2063/+176
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-181-15/+41
|\| | |
| * | | imptcp: added additional information to stats recordRainer Gerhards2012-01-181-6/+10
| * | | imptcp: added basic stats countersRainer Gerhards2012-01-181-10/+32
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-17/+16
| |\ \ \
* | \ \ \ Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-1710-56/+404
|\ \ \ \ \
| * | | | | elasticsearch: move to asl 2.0Rainer Gerhards2012-01-171-14/+13
| * | | | | add elasticsearch output moduleNathan Scott2012-01-175-0/+323
| * | | | | add JSON escaping optionNathan Scott2012-01-173-38/+63
| | |_|/ / | |/| | |
| * | | | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-173-3/+5
| | |/ / | |/| |
| * | | licensing updateRainer Gerhards2012-01-161-17/+16
* | | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-163-2/+14
* | | | fix error of not define HAVE_SETSIDPeng Haitao2012-01-161-0/+7
* | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-16113-1708/+1594
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-162-1/+23
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-162-1/+23
| | |\|
| | | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-162-2/+24
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-16111-1707/+1571
| |\| |
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| | |\|
| | | * license changesRainer Gerhards2012-01-1645-704/+617
| | | * runtime license changeRainer Gerhards2012-01-1620-297/+265
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| | |\|
| | | * license changeRainer Gerhards2012-01-142-35/+30
| | * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1443-647/+645
| | |\|
| | | * more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| | | * rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | | * more files moved to ASL 2.0Rainer Gerhards2012-01-124-66/+58
| | | * some more files to ASL 2.0Rainer Gerhards2012-01-117-108/+104
| | | * relicense parts under ASL 2.0Rainer Gerhards2012-01-1120-294/+316
| | * | relicense to ASL 2.0Rainer Gerhards2012-01-111-24/+14
| * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-092-5/+7
| |\| |
* | | | omfwd refactor: even more simplification (small one ;))Rainer Gerhards2012-01-141-2/+1
* | | | cosmetic: cleanup of ChangeLogRainer Gerhards2012-01-141-2/+0
* | | | omfwd license change to ASL 2.0Rainer Gerhards2012-01-141-20/+16
* | | | omfwd refactor: simplificationRainer Gerhards2012-01-141-9/+6
* | | | omfwd refactor: simplifying codeRainer Gerhards2012-01-141-21/+9
* | | | Merge branch 'v5-devel' into v5-devel-tmpRainer Gerhards2012-01-121-4/+0
|\ \ \ \
| * | | | regression fix: imuxsock-received messages were malformedRainer Gerhards2012-01-121-4/+0
* | | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
* | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-104-1/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-104-1/+16
| |\ \ \ \
| | * | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-104-1/+16
generated by cgit (git 2.34.1) at 2024-04-27 00:55:41 +0000