summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-171-0/+3
|\
| * add elasticsearch output moduleNathan Scott2012-01-171-0/+3
* | fix error of not define HAVE_SETSIDPeng Haitao2012-01-161-0/+7
* | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-1614-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
* | | omfwd refactor: even more simplification (small one ;))Rainer Gerhards2012-01-141-2/+1
* | | omfwd license change to ASL 2.0Rainer Gerhards2012-01-141-20/+16
* | | omfwd refactor: simplificationRainer Gerhards2012-01-141-9/+6
* | | omfwd refactor: simplifying codeRainer Gerhards2012-01-141-21/+9
* | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-0/+3
|\ \ \
| * \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+9
| |\ \ \
| | * | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-0/+9
| * | | | Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-0/+3
| |\| | | | | |_|/ | |/| |
| | * | added canned template for ultra-exact sysklogd file formatTomas Heinrich2012-01-101-0/+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
* | | | 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 '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 v5-develAndre Lorbach2011-08-161-0/+2
|\| | | | |
| * | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-121-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
|\| | | | |
| * | | | | 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 'v5-stable' into v5-develRainer 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
* | | | | issue a warning if old omusrmsg action syntax is usedRainer Gerhards2011-07-061-2/+10
* | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-061-1/+3
|\| | | |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-061-1/+3
| |\| | |
| | * | | added support for the ":omusrmsg:" syntax in configuring user messagesRainer Gerhards2011-07-061-1/+3