summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-8/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-072-1/+209
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | milestone: added capability to use a local interface IP address as fromhost-ipRainer Gerhards2012-03-211-9/+2
| | |_|/ | |/| |
| * | | added capability to use a local interface IP address as fromhost-ip for imuxsockRainer Gerhards2012-03-061-0/+1
| * | | queue: lightdelay config: keep default of 70% until mark is explicitely setRainer Gerhards2012-02-221-3/+5
| * | | added configuration directives to customize queue light delay marksRainer Gerhards2012-02-211-2/+6
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-03-172-1/+209
|\ \ \ \
| * \ \ \ 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
| | |/ /
* | | | ompipe: cosmetic, rename varRainer Gerhards2012-01-271-12/+12
* | | | ompipe: support for v6 config system addedRainer Gerhards2012-01-272-9/+63
* | | | cosmetic: remove compiler warningsRainer Gerhards2012-01-192-3/+2
* | | | refactor: remove very old sync.[ch] system for "abstracting" mutex accessRainer Gerhards2012-01-191-2/+2
* | | | omshell: light cleanupRainer Gerhards2012-01-191-11/+7
* | | | v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-196-25/+10
* | | | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-192-27/+27
|\| | |
| * | | 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 'v5-stable' into v6-stableRainer Gerhards2012-01-1413-194/+178
| |\ \ \
| * \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-2/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'v5-stable' into betaRainer Gerhards2011-09-263-10/+15
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-182-46/+35
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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
| |\| | | | |
| * | | | | | 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 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
| | |\| | |