summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'beta'Rainer Gerhards2012-10-165-53/+41
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-163-38/+17
| |\ | | | | | | | | | | | | Conflicts: rsyslog.service.in
| | * cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-164-39/+14
| | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions
| * | doc: mention recent patches in ChangeLogRainer Gerhards2012-10-161-3/+7
| | |
| * | systemd: Remove obsolete ExecStartPre commandMichael Biebl2012-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | With the introduction of the journal in systemd v38 [1], the systemd-kmsg-syslogd.service service was removed. All major distributions which ship systemd use v44 or later in their current releases, so it seems safe to drop the ExecStartPre command. [1] http://lists.freedesktop.org/archives/systemd-devel/2012-January/004188.html
| * | systemd: Drop obsolete compatibility flagMichael Biebl2012-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | In v6 [1], the compatibility mode has been removed and -c is a basically a no-op. So just drop that obsolete command line flag. [1] http://www.rsyslog.com/doc/v6compatibility.html
| * | prepare for version 7.1.11Rainer Gerhards2012-10-163-4/+8
| | |
| * | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-9/+11
| |\|
| | * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-162-8/+10
| | |\ | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | | * bugfix: imuxsock truncated head of received messageRainer Gerhards2012-10-162-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only under some circumstances. Thanks to Marius Tomaschwesky, Florian Piekert and Milan Bartos for their help in solving this issue. Note that Milan sent a patch, which solved the problem under some conditions (can be found somewhat earlier in git history). However, it did not handle the original root cause, and so did not fix the problem always. The main reason was that the date parser modifies the provided lenghts. That part of the API was not properly used by the caller (who decremented the length once more).
| | | * fix problem with cutting first 16 characters from message with bAnnotate on ↵Milan Bartos2012-10-101-1/+5
| | | | | | | | | | | | | | | | modified: plugins/imuxsock/imuxsock.c
| | * | doc: fix minor small but important typo in ChangeLogRainer Gerhards2012-10-161-1/+1
| | | |
* | | | doc: update ChangeLog with CEE cookie changeRainer Gerhards2012-10-111-0/+8
| | | | | | | | | | | | | | | | | | | | this is important for interop, so make sure each affected version correctly lists it.
* | | | Merge branch 'beta'Rainer Gerhards2012-10-113-3/+26
|\| | |
| * | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-111-0/+12
| |\| | | | | | | | | | | | | | | | | | Conflicts: plugins/mmjsonparse/mmjsonparse.c
| | * | change lumberjack cookie to "@cee" from "@cee "Rainer Gerhards2012-10-112-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CEE originally specified the cookie with SP, whereas other lumberjack tools used it without space. In order to keep interop with lumberjack, we now use the cookie without space as well. I hope this can be changed in CEE as well when it is released at a later time. Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
| * | | Don't require the trailing space in @cee: cookieMiloslav Trmač2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The only mention of @cee: in the Lumberjack pages, https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space, and libumberlog does not in fact generate one.
| * | | doc: add last patch to ChangeLogRainer Gerhards2012-10-111-0/+2
| | | |
| * | | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | Merge branch 'beta'Rainer Gerhards2012-10-119-8/+49
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | add deprecated note to discard actionRainer Gerhards2012-10-113-1/+25
| | | |
| * | | added deprecated note to omrulesetRainer Gerhards2012-10-113-0/+10
| | | |
| * | | make omruleset non-default in ./configureRainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | as this module's functionality has been superseeded by the "call" statement. Thanks to Michael Biebl for alerting me on the still-old default.
| * | | preparing for 7.1.10 releaseRainer Gerhards2012-10-112-2/+2
| | | |
| * | | fix regression introduced by last commitRainer Gerhards2012-10-111-1/+1
| | | | | | | | | | | | | | | | action object was created twice, resulting in memleak
| * | | bugfixes in regards to action()Rainer Gerhards2012-10-112-0/+4
| | | | | | | | | | | | | | | | | | | | - bugfix: small memory leak when processing action() statements - bugfix: unknown action() parameters were not reported
| * | | bugfix: some config processing warning messages were treated as errorsRainer Gerhards2012-10-112-2/+7
| | | |
| * | | cosmetic: simplifyRainer Gerhards2012-10-111-3/+1
| | | |
| * | | fix double-freeRainer Gerhards2012-10-111-1/+1
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+1
|\| | |
| * | | add missing prototypeRainer Gerhards2012-10-111-0/+1
| | | |
| * | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | | |
* | | | Merge branch 'beta'Rainer Gerhards2012-10-111-0/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | mention recent changes in ChangeLogRainer Gerhards2012-10-111-1/+6
| | | |
| * | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | |
| * | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-113-7/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: template.c
| * | | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | | | |
| * | | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | | | |
| * | | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | | |
| * | | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | | | |
| * | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| |\ \ \ \
* | \ \ \ \ Merge branch 'beta'Rainer Gerhards2012-10-103-5/+24
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | cosmetic cleanupRainer Gerhards2012-10-091-3/+1
| | | | | |
| * | | | | prepare for 7.1.9 releaseRainer Gerhards2012-10-093-4/+4
| | | | | |
| * | | | | bugfix: in (non)equal comparisons the position of arrays influenced resultRainer Gerhards2012-10-092-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This behaviour is OK for "contains"-type of comparisons (which have quite different semantics), but not for == and <>, which shall be commutative. This has been fixed now, so there is no difference any longer if the constant string array is the left or right hand operand. We solved this via the optimizer, as it keeps the actual script execution code small.
* | | | | | preparing for 7.3.0 releaseRainer Gerhards2012-10-083-3/+3
| | | | | |
* | | | | | fix compile problem with DEBUG instrumentation enabledRainer Gerhards2012-10-081-1/+0
| | | | | |
* | | | | | Merge branch 'c1-streamzip' into master-streamzipRainer Gerhards2012-10-055-51/+125
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c
generated by cgit (git 2.34.1) at 2024-11-11 14:13:32 +0000