summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* v6.1/2 scoping support removed from pluginsRainer Gerhards2012-01-191-34/+3
|
* Merge branch 'v6-stable'Rainer Gerhards2012-01-194-16/+4
|\ | | | | | | | | | | | | Conflicts: runtime/conf.c runtime/modules.c runtime/modules.h
| * removing the newScope/resumeScope macro interfacesRainer Gerhards2012-01-194-16/+4
| | | | | | | | to make using pre-v6-plugins even easier
* | Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-198-85/+76
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/immark/immark.c plugins/imptcp/imptcp.c plugins/imrelp/imrelp.c plugins/imtcp/imtcp.c plugins/imtemplate/imtemplate.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c plugins/omtemplate/omtemplate.c runtime/glbl.c runtime/parser.c tools/omfile.c tools/syslogd.c
| * undoing v6.1 config scoping interface, part IRainer Gerhards2012-01-187-37/+28
| | | | | | | | The most common files are now changed, more needs to be done.
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-1867-1036/+912
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
* | \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-182-1/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html plugins/imptcp/imptcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/parser.c template.c tools/omfwd.c tools/syslogd.c
| * \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-1667-1036/+912
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-1667-1036/+912
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-091-5/+5
| | |\ \ \
| * | | | | part of merge, but forgot to add to merge setRainer Gerhards2012-01-101-0/+3
| | | | | |
| * | | | | Merge branch 'v4-stable-tmp' into v5-devel-tmpRainer Gerhards2012-01-101-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h tools/syslogd.c
| | * \ \ \ \ Merge branch 'tmp' into v4-stable-tmpRainer Gerhards2012-01-101-1/+5
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dirty.h doc/rsyslog_conf_global.html tools/syslogd.c
| | | * | | | | added $SpaceLFOnReceive config directiveTomas Heinrich2012-01-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-091-5/+5
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-1853-812/+716
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-1665-1001/+882
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/obj.c runtime/parser.h runtime/wti.h
| | * | | | | | | license changesRainer Gerhards2012-01-1645-704/+617
| | | | | | | | |
| | * | | | | | | runtime license changeRainer Gerhards2012-01-1620-297/+265
| | | | | | | | |
| * | | | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-142-35/+30
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | |
| | * | | | | | license changeRainer Gerhards2012-01-142-35/+30
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | after careful consideration of affected code
* | | | | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-091-5/+5
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-092-5/+7
| |\| | | | |
| | * | | | | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * | | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
| | | | | | |
* | | | | | | Merge branch 'beta'Rainer Gerhards2012-01-091-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html
| * | | | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. -------------------------
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-201-0/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-0/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * | | | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+2
| | | | | | |
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-193-4/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-4/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * | | | | better performance for action stats & cleanup: removing debug printsRainer Gerhards2011-12-191-4/+0
| | | | | | |
| * | | | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| | * | | | | added instrumentationRainer Gerhards2011-12-192-1/+12
| | | |/ / / | | |/| | |
| * | | | | experimental: added first stats counter to action objectRainer Gerhards2011-12-161-1/+1
| | | | | |
| * | | | | more work on queue statistics counterRainer Gerhards2011-12-162-5/+10
| | | | | |
| * | | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-162-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-162-38/+53
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/modules.c
| * | | | | enhanced module loader to not rely on PATH_MAXRainer Gerhards2011-12-161-34/+46
| | | | | |
| * | | | | one further change to support gnutls without libgcryptRainer Gerhards2011-10-211-0/+2
| | | | | |
* | | | | | Merge branch 'beta'Rainer Gerhards2011-12-121-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | Conflicts: action.c
| | | * | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-1/+1
| | | |\ \ \
| | | | * | | bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | Merge branch 'beta'Rainer Gerhards2011-10-272-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
| * | | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-271-2/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-271-2/+6
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
generated by cgit (git 2.34.1) at 2024-05-26 05:12:58 +0000