summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-061-0/+5
|\
| * add small delay (50ms) after sending shutdown messageRainer Gerhards2012-06-041-0/+5
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-011-2/+5
|\|
| * cosmetic: slightly improved debug outputRainer Gerhards2012-05-311-2/+2
| * bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-291-0/+3
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-101-1/+1
|\|
| * cleanup: removing no longer needed macrosRainer Gerhards2012-05-041-1/+1
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-031-0/+1
|\|
| * debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-121-73/+97
|\|
| * imuxsock: do not cache hostnameRainer Gerhards2012-04-121-1/+1
| * Allocate LocalDomain as new stringMarius Tomaschewski2012-04-111-0/+3
| * bugfix: hostname was not requeried on HUPRainer Gerhards2012-04-111-72/+93
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-03-172-1/+209
|\|
| * added tool to recover disk queue if .qi file is missing (recover_qi.pl)Kaiwang Chen2012-03-152-1/+209
* | undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-183-75/+75
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-1/+21
|\|
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-161-1/+21
| |\
| | * FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-161-2/+22
* | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1413-194/+178
|\| |
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1413-194/+178
| |\|
| | * more license analysis & changeRainer Gerhards2012-01-1411-178/+163
| | * rsyslog.conf.5 socket module example sb imuxsockJim Hill2012-01-141-1/+1
| | * relicense parts under ASL 2.0Rainer Gerhards2012-01-111-15/+14
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-2/+3
|\| |
| * | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
* | | Merge branch 'v5-stable' into betaRainer Gerhards2011-09-263-10/+15
|\| |
| * | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-3/+2
| * | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-222-6/+12
| |\|
| | * bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-201-4/+10
| | * Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stableRainer Gerhards2011-09-153-31/+98
| | |\
| | | * Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-1/+1
| | | |\
| | | * \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-7/+9
| | | |\ \
| | | * | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-111-1/+8
| | | * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-112-2/+12
| | | |\ \ \
| | | * \ \ \ Merge branch 'v4-stable' into v4-develRainer Gerhards2011-05-091-2/+2
| | | |\ \ \ \
| | * | | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
* | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-301-3/+1
|\| | | | | |
| * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+1
| |\| | | | |
| | * | | | | bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-0/+2
|\| | | | |
| * | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-0/+2
| * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
| |\| | | |
* | | | | | Merge branch 'v4-stable' into betaRainer Gerhards2011-07-111-7/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | added warning message for old-style outchannel syntaxRainer Gerhards2011-07-111-1/+8
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+9
| |\| | |
| | * | | support for :omfile: forward compatibility directiveRainer Gerhards2011-07-111-1/+9