summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-261-11/+39
|\
| * bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-261-0/+3
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-221-0/+28
| |\
| | * bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-201-0/+5
| | * Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-071-0/+98
| | |\
| | | * preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-311-1/+1
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-071-1/+7
|\| | |
| * | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-071-0/+3
| * | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-051-0/+4
* | | | cosmetic: adding imported bugfix to ChangeLogRainer Gerhards2011-08-311-1/+2
* | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-311-0/+1
|\| | |
| * | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
* | | | Merge branch 'v4-beta' into v5-develRainer Gerhards2011-08-301-0/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-301-3/+5
| |\ \ \ | | | |/ | | |/|
| * | | Added changelog entryAndre Lorbach2011-08-111-0/+1
| * | | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-111-0/+1
| |\ \ \
| * \ \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-091-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-051-0/+7
| |\ \ \ \ \
| * | | | | | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-111-1/+1
| * | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-111-3/+15
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-301-4/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+6
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | added bug info to ChangeLogRainer Gerhards2011-08-301-2/+3
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Added MsgDup bugfix from v5-stable into v4-stable branchAndre Lorbach2011-08-111-0/+1
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-181-0/+3
|\| | | | |
| * | | | | bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-181-0/+3
* | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-1/+3
|\| | | | |
| * | | | | bugfixes for tag emulationRainer Gerhards2011-08-111-1/+3
* | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-111-1/+5
|\| | | | |
| * | | | | fixed typo in changelogAndre Lorbach2011-08-101-1/+1
| * | | | | added changelog entryAndre Lorbach2011-08-101-0/+3
| * | | | | preparing for version 5.8.4v5.8.4root2011-08-101-1/+1
* | | | | | Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into v5-d...Andre Lorbach2011-08-101-0/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-091-0/+6
| |\ \ \ \ \ \
| * | | | | | | added capability to emit config error location info for warningsRainer Gerhards2011-08-091-0/+3
* | | | | | | | Added changelog entry for bugid 275Andre Lorbach2011-08-101-0/+2
* | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-101-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Added changelog entry for bugid 275Andre Lorbach2011-08-101-0/+3
| |/ / / / /
| * | | | | cosmetic: add imported bugfix to ChangeLogRainer Gerhards2011-08-091-0/+3
| * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-091-0/+3
| |\| | | |
| | * | | | bugfix: memcpy overflow can occur in allowed sender checkingMarius Tomaschewski2011-08-091-0/+3
| | | |_|/ | | |/| |
* | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-0/+10
|\| | | |
| * | | | Merge branch 'v4-stable' into v5-stableAndre Lorbach2011-08-051-0/+4
| |\| | |
| | * | | Merge branch 'v3-stable' into v4-stableAndre Lorbach2011-08-051-0/+4
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | bugfix: potential misadressing in property replacerAndre Lorbach2011-08-051-0/+1
| * | | | Added changelog entryAndre Lorbach2011-08-051-0/+3
* | | | | preparing for 5.9.2v5.9.2Rainer Gerhards2011-07-111-1/+1
* | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-07-111-2/+9
|\| | | |
| * | | | preparing for 5.8.3v5.8.3Rainer Gerhards2011-07-111-1/+4
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-07-111-1/+3
| |\| | |