summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v7-stable-newmsglock' into master-newmsglockRainer Gerhards2012-12-062-69/+71
|\
| * Merge branch 'v6-stable-newmsglock' into v7-stable-newmsglockRainer Gerhards2012-12-061-10/+0
| |\
| | * bugfix: some message properties could be garbled due to race conditionRainer Gerhards2012-12-061-10/+0
| * | fix missing functionality: ruleset(){} could not specify ruleset queueRainer Gerhards2012-11-301-52/+57
| * | silence compiler warningsRainer Gerhards2012-11-302-8/+15
* | | Merge branch 'v7-stable'Rainer Gerhards2012-11-221-0/+2
|\| |
| * | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-221-0/+2
| |\|
| | * bugfix: hostname set in rsyslog.conf was not picked up until HUPoxpa2012-11-221-0/+2
* | | Merge branch 'v7-stable'Rainer Gerhards2012-11-142-5/+5
|\| |
| * | bugfix: invalid formatting of man pagebjarniig@rhi.hi.is2012-11-141-4/+4
| * | Fix the rsyslogd man page formatting for the -d flagGeorgi Georgiev2012-11-141-1/+1
* | | Merge branch 'v7-stable'Rainer Gerhards2012-11-091-0/+5
|\| |
| * | enabled to build without libuuid, at loss of uuid functionalityRainer Gerhards2012-11-091-0/+5
| * | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-012-2/+2
| |\|
| | * bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-012-2/+2
| | * bugfix: build problems on some platformsRainer Gerhards2012-10-261-1/+1
| | * Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-172-38/+9
| | |\
* | | | improve debug logging a bitRainer Gerhards2012-11-051-4/+3
* | | | queue: change generic msg ptr (pUsr) to be of msg_t typeRainer Gerhards2012-11-031-3/+3
* | | | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-012-2/+2
* | | | Merge branch 'master-ratelimit'Rainer Gerhards2012-10-301-119/+48
|\ \ \ \
| * | | | rate-limit rsyslog internal messagesRainer Gerhards2012-10-231-2/+7
| * | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-231-1/+1
| |\ \ \ \
| * | | | | remove "last message repeated n times" from rsyslog output partRainer Gerhards2012-10-231-75/+3
| * | | | | Merge branch 'beta' into master-ratelimitRainer Gerhards2012-10-221-8/+1
| |\ \ \ \ \
| * | | | | | ratelimit: add default ratelimiterRainer Gerhards2012-10-191-4/+14
| * | | | | | cleanupRainer Gerhards2012-10-191-38/+0
| * | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-193-40/+11
| |\ \ \ \ \ \
| * | | | | | | ratelimit: added linux-like ratelimiter typeRainer Gerhards2012-10-151-1/+0
| * | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-153-5/+10
| |\ \ \ \ \ \ \
| * | | | | | | | ratelimiter: enable thread-safe mode & (related) API changesRainer Gerhards2012-10-151-32/+0
| * | | | | | | | interface cleanup (probably not final)Rainer Gerhards2012-10-151-11/+12
| * | | | | | | | milestone: ratelimiter used in imptcpRainer Gerhards2012-10-151-0/+43
| * | | | | | | | new ratelimit: interface plumbing addedRainer Gerhards2012-10-091-5/+18
* | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-301-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | bugfix: omfwd did not properly support "template" parameterRainer Gerhards2012-10-301-1/+4
* | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-272-1/+13
|\| | | | | | | | | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | add -D rsyslogd option to enable config parser debug modeRainer Gerhards2012-10-272-1/+13
* | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-231-1/+1
|\| | | | | | |
| * | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-221-1/+1
* | | | | | | | re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-221-4/+0
* | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-222-8/+5
|\| | | | | | | | |_|_|/ / / / |/| | | | | |
| * | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-0/+4
| | |_|/ / / | |/| | | |
| * | | | | doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-182-3/+3
|\| | | | |
| * | | | | build: Drop unused CNF_LIBS variableMichael Biebl2012-10-181-2/+2
| * | | | | doc: typo fixRainer Gerhards2012-10-171-1/+1
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-162-38/+9
|\| | | | | | |_|/ / / |/| | | |
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-38/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-162-38/+9