summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | added support for v6 config system to omfwdRainer Gerhards2011-10-116-76/+244
| | | | | |
* | | | | | bugfix: facility local<x> was not correctly interpreted in legacy filtersRainer Gerhards2011-09-282-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was only accepted if it was the first PRI in a multi-filter PRI. Thanks to forum user Mark for bringing this to our attention.
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-09-269-19/+102
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c
| * | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-263-22/+52
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c
| | * | | | bugfix: omfile returns fatal error code for things that go really wrongRainer Gerhards2011-09-263-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover.
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-09-223-6/+40
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c
| | | * | | bugfix: potential abort if ultra-large file io buffers are used andRainer Gerhards2011-09-202-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms)
| | | * | | Merge branch 'v4-stable' of git+ssh://git.adiscon.com/git/rsyslog into v4-stableRainer Gerhards2011-09-15101-381/+5139
| | | |\ \ \
| | | | * \ \ Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0Rainer Gerhards2011-09-07101-381/+5139
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html
| | | | | * | | preparing for 4.7.5 releasev4.7.5Rainer Gerhards2011-08-313-3/+3
| | | | | | | |
| | | * | | | | typo fixAndrew Stothard2011-09-152-2/+2
| | | |/ / / /
| | | * | | | preparing for 4.6.8 releasev4.6.8Rainer Gerhards2011-08-312-2/+2
| | | | | | |
| * | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-09-073-6/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
| | * | | | | bugfix: imuxsock did no longer ignore message-provided timestamp,Rainer Gerhards2011-09-072-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281
| | * | | | | bugfix: rsyslogd -v always said 64 atomics were not presentmono_matsuko2011-09-052-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | preparing for 5.8.5 releasev5.8.5Rainer Gerhards2011-08-312-2/+2
| | | | | | |
| * | | | | | preparing for 5.9.3 releasev5.9.3Rainer Gerhards2011-08-312-2/+2
| | | | | | |
| * | | | | | 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