summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into masterRainer Gerhards2012-01-1814-195/+199
|\
| * 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 '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-devel'Rainer Gerhards2011-10-211-2/+3
|\ \ \
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-211-2/+3
| |\| |
| | * | minor: slightly improved error reporting when dynafile open failsRainer Gerhards2011-10-201-2/+3
* | | | added support for v6 config system to omfwdRainer Gerhards2011-10-112-73/+232
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-263-13/+17
|\| | |
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-261-10/+13
| |\| |
| | * | 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
| | | | |\ \ \
| | | * | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-071-1/+1
| |\| | | | |
| | * | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-1/+1
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-301-3/+1
| |\| | | | |
| * | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-0/+2
| |\ \ \ \ \ \
| * | | | | | | added capability to emit config error location info for warningsRainer Gerhards2011-08-091-0/+4
| * | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-7/+9
| |\ \ \ \ \ \ \
* | | | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-081-1/+2
* | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-301-3/+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 'beta'Andre Lorbach2011-08-181-0/+2
|\| | | | | | |
| * | | | | | | 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 betaRainer Gerhards2011-07-111-7/+9
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-07-111-1/+16
| |\ \ \ \ \ \
* | | | | | | | regression: omfile aborted on dynafiles (never released bug)Rainer Gerhards2011-08-011-4/+3
* | | | | | | | working around automake curiosityRainer Gerhards2011-07-221-1/+4
* | | | | | | | build system cleanup/improvementRainer Gerhards2011-07-221-1/+2
* | | | | | | | omusrmsg now supports the new config systemRainer Gerhards2011-07-212-39/+128
* | | | | | | | milestone: omfile basically gets its parameters via the new systemRainer Gerhards2011-07-211-47/+151
* | | | | | | | milestone: new output plugin interface call addedRainer Gerhards2011-07-212-0/+4
* | | | | | | | milestone: on the way to a new action conf interface to plugins...Rainer Gerhards2011-07-201-0/+81
* | | | | | | | cleanupRainer Gerhards2011-07-201-21/+1
* | | | | | | | Merge branch 'v5-stable'Rainer Gerhards2011-07-131-7/+9
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-7/+9
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| | * | | | | doc: updated rsyslog.conf man page with new syntaxesRainer Gerhards2011-07-111-7/+9
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'master-newconf'Rainer Gerhards2011-07-123-244/+16
|\ \ \ \ \ \