summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-beta'Rainer Gerhards2011-02-252-3/+1
|\
| * cosmetic: removing commented-out testing aidRainer Gerhards2011-02-251-1/+0
| * bugfix (minor): warning message suggested invalid compatibility modeRainer Gerhards2011-02-221-1/+1
| * regression: fixed compile error with --enable-debugRainer Gerhards2011-02-211-1/+0
* | Merge branch 'v5-beta'Rainer Gerhards2011-02-183-10/+6
|\|
| * bugfix: fixed compile problem due to empty structsDražen Kačar2011-02-161-0/+1
| * cleanup: no longer parameter in iminternal system removedRainer Gerhards2011-02-163-10/+6
* | Merge branch 'v5-beta'Rainer Gerhards2011-02-111-3/+36
|\|
| * fixed some compile issues in recent systemd patchRainer Gerhards2011-02-111-1/+1
| * Improved systemd socket activation supportMarius Tomaschewski2011-02-111-3/+36
* | Merge branch 'v5-devel'Rainer Gerhards2010-12-175-17/+10
|\|
| * Merge branch 'v4-devel' into v5-develRainer Gerhards2010-12-171-3/+0
| |\
| | * added $LocalHostName config directive & some bugfixingRainer Gerhards2010-12-161-3/+3
| | * cleanup of cosmetic nit (result of clang static code analyser run)Rainer Gerhards2010-12-161-1/+1
| | * Merge branch 'v4-stable' into v4-develRainer Gerhards2010-12-165-8/+2
| | |\
| | * \ Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-192-1/+2
| | |\ \
| * | \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2010-12-175-7/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-164-6/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-164-6/+0
| | | * | | typo fix (thanks to Björn Påhlsson for finding it!)Michael Biebl2010-11-301-2/+2
| | | | |/ | | | |/|
| | * | | fixed cosmetic nit (as a result of clang static code analyzer run)Rainer Gerhards2010-12-161-1/+1
| * | | | bugfix: one type of 64bit atomics was enabled when 32bit atomics were supportedRainer Gerhards2010-12-021-7/+7
* | | | | mmnormalize loads & runs (basic testing done)Rainer Gerhards2010-12-011-1/+1
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-11-251-1/+5
|\| | | |
| * | | | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-11-251-1/+5
| |\| | |
| | * | | bugfix: replacements for atomic operations for non-int sized types had problems.Rainer Gerhards2010-11-251-1/+5
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-222-1/+2
|\| | | |
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-10-222-1/+2
| |\| | |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-192-1/+2
| | |\| |
| | | * | fixing some compile problems on FreeBSDRainer Gerhards2010-10-192-1/+2
| | * | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-151-1/+1
| | |\ \ \ | | | | |/ | | | |/|
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-151-1/+1
|\| | | |
| * | | | removed need for math libraryRainer Gerhards2010-10-111-1/+1
* | | | | omhdfs: fixed some issues with new config interface functionsRainer Gerhards2010-10-051-22/+0
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-052-5/+4
|\| | | |
| * | | | imuxsock: changed to per-pid ratelimitingRainer Gerhards2010-09-281-1/+1
| * | | | minor: improved error message when already runningRainer Gerhards2010-09-171-4/+3
* | | | | Merge branch 'v5-devel'Rainer Gerhards2010-09-082-30/+33
|\| | | |
| * | | | Merge branch 'systemd' into v5-develRainer Gerhards2010-09-082-30/+33
| |\ \ \ \
| | * | | | acquire /dev/log socket optionally from systemdLennart Poettering2010-09-072-30/+33
* | | | | | Merge branch 'master' into tmpRainer Gerhards2010-08-111-1/+4
|\| | | | |
| * | | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-111-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| | * | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-111-1/+1
| | |\ \ \
| | | * | | added imptcpRainer Gerhards2010-08-101-1/+1
| | | | |/ | | | |/|
| * | | | changed omudpspoof default spoof address to simplify typical use caseRainer Gerhards2010-08-051-0/+3
| | |_|/ | |/| |
* | | | fixed regression from last commitRainer Gerhards2010-07-276-0/+6
* | | | milestone commit: output plugin interface changes (may NOT run)Rainer Gerhards2010-07-276-103/+186
* | | | added support to save/restore rsyslog core action settings...Rainer Gerhards2010-07-231-5/+0
* | | | moving towards scoping inside rsyslog.confRainer Gerhards2010-07-213-77/+77
|/ / /
* | | fixed a couple of regressionsRainer Gerhards2010-06-234-4/+0