summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* imuxsock: use a default ratelimiter if none else appliesRainer Gerhards2012-10-231-1/+9
* Merge branch 'tmp-ratelimit' into master-ratelimitRainer Gerhards2012-10-235-13/+25
|\
| * Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-235-13/+25
| |\
| | * Merge branch 'v7-stable'Rainer Gerhards2012-10-234-8/+17
| | |\
| | | * Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-222-5/+11
| | | |\
| | | | * preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-225-7/+10
| | | | * Merge branch 'v6-beta' into v6-stableRainer Gerhards2012-10-2288-935/+7279
| | | | |\
| | | | | * Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-4/+4
| | | | | |\
| | | | | * | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
| | | | | * | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-5/+1
| | | | | |\ \
| | | | | * \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-176-45/+22
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-162-9/+11
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-112-1/+7
| | | | | |\ \ \ \ \
| | | | | * | | | | | preparing for 6.5.1 releasev6.5.1Rainer Gerhards2012-10-113-3/+3
| | | * | | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-225-5/+8
| | | * | | | | | | | testbench: -c option no longer existsRainer Gerhards2012-10-221-2/+2
| | * | | | | | | | | bugfix: segfault on startup when modules using MSG_PASSING mode are usedRainer Gerhards2012-10-232-1/+5
| | * | | | | | | | | Merge branch 'beta-newgrammar'Rainer Gerhards2012-10-222-3/+7
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | permit action-like statements (stop, call, ...) in action listsRainer Gerhards2012-10-222-3/+5
| | * | | | | | | | | | re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-222-8/+0
| | * | | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-224-9/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-222-0/+8
| | | |/ / / / / / / /
* | | / / / / / / / / nit: valgrind-testaid was accidentely enabled in testbenchRainer Gerhards2012-10-231-1/+1
|/ / / / / / / / / /
* | | | | | | | | | remove "last message repeated n times" from rsyslog output partRainer Gerhards2012-10-237-232/+26
* | | | | | | | | | Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-222-9/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1
| * | | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-221-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'v5-stable' into v6-stablev6.4.3.unfinishedRainer Gerhards2012-10-221-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | doc: v3 compatibility doc lists invalid config directiveRainer Gerhards2012-10-221-1/+1
* | | | | | | | | | ratelimit: add default ratelimiterRainer Gerhards2012-10-191-4/+14
* | | | | | | | | | cleanupRainer Gerhards2012-10-191-38/+0
* | | | | | | | | | imklog, impstats: support for new rate-limiting API addedRainer Gerhards2012-10-192-6/+5
* | | | | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-1924-230/+282
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-192-4/+4
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-4/+4
| | |\| | | | | | |
| | | * | | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-192-4/+4
| | | |\| | | | | | | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-192-4/+4
| * | | | | | | | doc: improve module docFlorian Riedl2012-10-191-26/+42
| * | | | | | | | prepare for 7.3.1 releasev7.3.1Rainer Gerhards2012-10-193-3/+3
| * | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-192-7/+5
| |\| | | | | | |
| | * | | | | | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-2/+3
| | * | | | | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-192-5/+1
| | |\| | | | | |
| | | * | | | | | bugfix: imuxsock did not properly honor $LocalHostIPIFRainer Gerhards2012-10-192-5/+1
| | | | |_|_|_|/ | | | |/| | | |
| * | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-185-63/+9
| |\| | | | | |
| | * | | | | | preparing for 7.1.12 releasev7.1.12Rainer Gerhards2012-10-183-3/+5
| | * | | | | | build: Remove vestiges of the cust1 pluginMichael Biebl2012-10-181-1/+0
| | * | | | | | build: Drop unused include pathMichael Biebl2012-10-181-1/+1
| | * | | | | | build: Drop unused CNF_LIBS variableMichael Biebl2012-10-182-3/+2
| | * | | | | | build: Use pkg-config to check for libcurlMichael Biebl2012-10-181-19/+1
| | * | | | | | build: Use pkg-config to check for libuuidMichael Biebl2012-10-181-16/+1