summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* preparing for 6.1.4 releasev6.1.4Rainer Gerhards2011-02-183-4/+23
* Merge branch 'v5-beta'Rainer Gerhards2011-02-1817-41/+108
|\
| * Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-betaRainer Gerhards2011-02-172-5/+2
| |\
| | * Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-02-172-5/+2
| | |\
| | | * bugfix: testbench was not activated if no Java was present on systemRainer Gerhards2011-02-172-5/+2
| * | | bugfix: minor race condition in action.c - considered cosmeticRainer Gerhards2011-02-174-14/+20
| * | | preparing for 5.7.4 releasev5.7.4Rainer Gerhards2011-02-173-3/+3
| |/ /
| * | bugfix: fixed compile problem due to empty structsDražen Kačar2011-02-166-0/+8
| * | cleanup: no longer parameter in iminternal system removedRainer Gerhards2011-02-163-10/+6
| * | improved error reporting for $WorkDirectoryRainer Gerhards2011-02-153-1/+40
| * | bugfix: very long running actions could prevent shutdown under some circumsta...Rainer Gerhards2011-02-114-6/+11
| * | removed no longer needed codeRainer Gerhards2011-02-112-3/+0
| * | bugfix: queue engine did not properly slow down inputs in FULL_DELAY mode...Rainer Gerhards2011-02-112-1/+16
* | | Merge branch 'v5-beta'Rainer Gerhards2011-02-1112-69/+407
|\| |
| * | doc: added recent changes to changelogRainer Gerhards2011-02-111-0/+2
| * | fixed some compile issues in recent systemd patchRainer Gerhards2011-02-112-3/+3
| * | Improved systemd socket activation supportMarius Tomaschewski2011-02-112-47/+81
| * | bugfix in pmsnareDavid Lang2011-02-111-1/+6
| * | enhanced imfile to support non-cancel input terminationRainer Gerhards2011-02-102-6/+17
| * | bugfix: abort if imfile reads file line of more than 64KiBRainer Gerhards2011-02-102-1/+4
| * | cosmetic: making comments in stream.c a bit more readableRainer Gerhards2011-02-101-4/+6
| * | pmcisconames: bugfix for short timestampsDavid Lang2011-02-101-4/+23
| * | fixed invalid help strings in configure.acRainer Gerhards2011-02-081-4/+4
| * | prepare for new versionRainer Gerhards2011-02-081-0/+2
| * | added pmsnare parser moduleDavid Lang2011-02-085-1/+262
| * | preparing for 5.7.3v5.7.3Rainer Gerhards2011-02-043-3/+3
| * | removed invalid link from docRainer Gerhards2011-02-041-1/+0
* | | bugfix/omhdfs: directive $OMHDFSFileName rendered unusableRainer Gerhards2011-02-042-1/+5
* | | preparing for 6.1.3v6.1.3Rainer Gerhards2011-02-013-3/+5
* | | fixed some regressions in imptcpRainer Gerhards2011-02-011-2/+11
* | | Merge branch 'v5-devel'Rainer Gerhards2011-02-0119-80/+769
|\| |
| * | added doc for new ommysql directivesAriel P2011-02-011-0/+12
| * | added pmaixforwardedfrom message parserDavid Lang2011-02-014-0/+194
| * | added $OMMySQLConfigFile/$OMMySQLConfigSection config directivesAriel P2011-01-312-0/+41
| * | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-01-262-11/+29
| |\|
| | * preparing for v5.6.3v5.6.3Rainer Gerhards2011-01-263-3/+4
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-01-262-10/+26
| | |\
| | | * imfile bugfix: potential duplication of log contentRainer Gerhards2011-01-102-13/+12
| | | * forgot the actual patch with the last commit :(Rainer Gerhards2010-12-171-1/+1
| | | * bugfix: imfile potentially duplicates linesRainer Gerhards2010-12-172-0/+17
| * | | Merge branch 'v5-devel-david-imfile' into v5-develRainer Gerhards2011-01-265-29/+101
| |\ \ \
| | * | | enhanced imfile to support multi-line messagesDavid Lang2011-01-255-29/+101
| * | | | pmciscomsg: fixed some problemsDavid Lang2011-01-251-4/+9
| * | | | integrated pmciscomsg into the build systemRainer Gerhards2011-01-132-0/+19
| * | | | added pmcisconames (uncompiled & untested)David Lang2011-01-132-0/+161
| |/ / /
| * | | Merge branch 'v5.6.2-newimudp' into v5-devel-newimudpRainer Gerhards2011-01-108-4/+212
| |\ \ \
| | * | | improved imudp real-time scheduling support & bugfixDražen Kačar2011-01-108-3/+211
| * | | | Merge branch 'v4-devel' into v5-devel-newimudpRainer Gerhards2011-01-101-42/+1
| |\ \ \ \
| | * | | | imudp: removing new scheduling priority setting codeRainer Gerhards2011-01-102-43/+0
| | * | | | added support for systems without epoll_create1()Rainer Gerhards2010-12-172-2/+20