summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | cosmetic: adding imported bugfix to ChangeLogRainer Gerhards2011-08-311-1/+2
| | | | | | | |
| * | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-313-25/+25
| |\| | | | | |
| * | | | | | | Merge branch 'v4-beta' into v5-develRainer Gerhards2011-08-301-0/+12
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| | * | | | | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-302-4/+6
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | Added changelog entryAndre Lorbach2011-08-111-0/+1
| | | | | | | |
| | * | | | | | Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-112-1/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'v4-stable' into v4-betaRainer Gerhards2011-08-092-1/+4
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'v4-stable' into v4-betaAndre Lorbach2011-08-053-14/+23
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | preparing for 4.7.4v4.7.4Rainer Gerhards2011-07-113-3/+3
| | | | | | | | | | |
| | * | | | | | | | | issue a warning message for old-style dynafile actionRainer Gerhards2011-07-113-1/+28
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2011-07-1114-29/+58
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-302-7/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-184-3/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-165-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-112-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-devel' of git+ssh://al@git.adiscon.com/git/rsyslog into ↵Andre Lorbach2011-08-105-6/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v5-devel
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v5-stable' into v5-develRainer Gerhards2011-08-092-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | added capability to emit config error location info for warningsRainer Gerhards2011-08-095-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into v5-develAndre Lorbach2011-08-054-15/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | | | | | | | | | | | | | | | | preparing for 6.3.6 releasev6.3.6Rainer Gerhards2011-09-193-3/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | bugfix: config parser did not support properties with dashes in themRainer Gerhards2011-09-152-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...inside property-based filters. Thanks to Gerrit Seré for reporting this.
* | | | | | | | | | | | | | | | | | | added $InputRELPServerBindRuleset directive to specify rulesets for RELPRainer Gerhards2011-09-086-19/+62
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'beta'v6.3.5Rainer Gerhards2011-08-311-15/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html tests/Makefile.am
| * | | | | | | | | | | | | | | | | | preparing for 6.1.12 releasev6.1.12Rainer Gerhards2011-08-313-16/+16
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | preparing for 6.3.5 releaseRainer Gerhards2011-08-312-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-313-24/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c
| * | | | | | | | | | | | | | | | | | cosmetic: adding imported bugfix to ChangeLogRainer Gerhards2011-08-311-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-313-25/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | bugfix: mark message processing did not work correctlyRainer Gerhards2011-08-313-25/+25
| | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'beta'Rainer Gerhards2011-08-302-8/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | | | | | | | | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-08-302-7/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | | | | | | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-08-302-6/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | / / / | | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/syslogd.c
| | | * | | | | | | | | | | | | | added bug info to ChangeLogRainer Gerhards2011-08-301-2/+3
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'v4-stable-rhel-bug' into v4-stableRainer Gerhards2011-08-301-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | bugfix: off-by-one(two) bug in legacy syslog parserRainer Gerhards2011-08-101-1/+1
| | | | | |_|_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | |
| | | * / | | | | | | | | | | | Added MsgDup bugfix from v5-stable into v4-stable branchAndre Lorbach2011-08-112-1/+2
| | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'beta'Andre Lorbach2011-08-186-8/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-186-7/+47
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * | | | | | | | | | | | | removed debug code from action.c and runtime/queue.c after testingAndre Lorbach2011-08-182-21/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | bugfix: fixed incorrect state handling for Discard Action (transactions)Andre Lorbach2011-08-184-3/+49
| | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stableAndre Lorbach2011-08-121-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | minor doc: made body tag parsable for web site scriptsRainer Gerhards2011-08-121-2/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Added debug output into message parsers needed for bugtrackingAndre Lorbach2011-08-123-1/+8
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed version to 5.8.5-pre1
| | * | | | | | / / / / / / bugfixes for tag emulationRainer Gerhards2011-08-112-3/+8
| | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation
* | | | | | | | | | | | | Merge branch 'beta'Andre Lorbach2011-08-112-2/+6
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'v5-stable' into betaAndre Lorbach2011-08-112-2/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | | | | | | fixed typo in changelogAndre Lorbach2011-08-101-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | added changelog entryAndre Lorbach2011-08-101-0/+3
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 22:35:47 +0000