summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | 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
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-111-1/+1
| | | | | | | | | |
| | * | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-111-3/+15
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-301-4/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-181-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-161-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-111-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into ↵Andre Lorbach2011-08-101-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v5-devel
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
| * | | | | | | | | | | | | | | | Added changelog entry for bugid 275Andre Lorbach2011-08-101-0/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-101-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-051-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | | | | | | | | | | | | | preparing for 6.3.6 releasev6.3.6Rainer Gerhards2011-09-191-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | bugfix: config parser did not support properties with dashes in themRainer Gerhards2011-09-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...inside property-based filters. Thanks to Gerrit Seré for reporting this.
* | | | | | | | | | | | | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-081-0/+3
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-311-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c
| * | | | | | | | | | | | | | | | | cosmetic: adding imported bugfix to ChangeLogRainer Gerhards2011-08-311-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-311-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-311-0/+1
| | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-301-5/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-301-4/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-301-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c
| | | * | | | | | | | | | | | | 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 'beta'Andre Lorbach2011-08-181-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-181-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | | | | | | | | | bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-181-0/+3
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | bugfixes for tag emulationRainer Gerhards2011-08-111-1/+3
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* | | | | | | | | | | | Merge branch 'beta'Andre Lorbach2011-08-111-1/+5
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-111-1/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | | | 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-stable' into betaAndre Lorbach2011-08-101-0/+3
| |\| | | | | | | | |
* | | | | | | | | | | Merge branch 'v5-stable'Andre Lorbach2011-08-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Added changelog entry for bugid 275Andre Lorbach2011-08-101-0/+3
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-091-0/+9
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | minor: added imported bug to ChangeLogRainer Gerhards2011-08-091-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-091-0/+6
| |\| | | | | | | |
| | * | | | | | | | 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
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...if a host name is resolved to IPv4-mapped-on-IPv6 address. Found by Ismail Dönmez at suse. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | | - imudp&imtcp now report error if no listener at all was definedRainer Gerhards2011-08-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Marcin for suggesting this error message
* | | | | | | | Merge branch 'beta'Andre Lorbach2011-08-051-2/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-051-0/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | Merge branch 'v4-stable' into v5-stableAndre Lorbach2011-08-051-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | | Merge branch 'v3-stable' into v4-stableAndre Lorbach2011-08-051-0/+4
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| | | | | | | | | Conflicts: runtime/msg.c