summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | which could also mean "never" or "not for a very long time".
* | | 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
| | | | | | | | | | | | | | | The indentation around the "-d" flag description is in the wrong place and does not display properly.
* | | 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
| | | | | | | | | | | | | | | | | | this enables smoother builds on older systems that do not support libuuid. Loss of functionality should usually not matter too much as uuid support has only recently been added and is very seldom used.
| * | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-012-2/+2
| |\|
| | * bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-012-2/+2
| | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used.
| | * 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
| | | | | | | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used.
* | | | Merge branch 'master-ratelimit'Rainer Gerhards2012-10-301-119/+48
|\ \ \ \
| * | | | rate-limit rsyslog internal messagesRainer Gerhards2012-10-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | a special ratelimiter is used; it's linux-type ratelimit settings are currently hardcoded
| * | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | ratelimit: added linux-like ratelimiter typeRainer Gerhards2012-10-151-1/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into master-ratelimitRainer Gerhards2012-10-153-5/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v7compatibility.html
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no actual implementation yet done
* | | | | | | | | Merge branch 'v7-stable'Rainer Gerhards2012-10-301-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| * | | | | | | | bugfix: omfwd did not properly support "template" parameterRainer Gerhards2012-10-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools.
* | | | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized.
* | | | | | | | re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge for action list functionality will follow soon
* | | | | | | | Merge branch 'beta'Rainer Gerhards2012-10-222-8/+5
|\| | | | | | | | |_|_|/ / / / |/| | | | | |
| * | | | | | disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem.
| * | | | | doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364
* | | | | | Merge branch 'beta'Rainer Gerhards2012-10-182-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | 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
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-38/+9
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: rsyslog.service.in
| | * | | cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-162-38/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions
* | | | | Merge branch 'beta'Rainer Gerhards2012-10-112-2/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | add deprecated note to discard actionRainer Gerhards2012-10-111-1/+7
| | | | |
| * | | | fix double-freeRainer Gerhards2012-10-111-1/+1
| | | | |
| * | | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | | |
* | | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-111-0/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: template.c