summaryrefslogtreecommitdiffstats
path: root/ChangeLog
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable-noscoping' into masterRainer Gerhards2012-01-191-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-0/+9
| | | | | | | | The most common files are now changed, more needs to be done.
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-181-1/+5
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imptcp/imptcp.c
* | \ Merge branch 'v5-devel' into masterRainer Gerhards2012-01-181-3/+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-elasticsearch' into v5-devel-tmpRainer Gerhards2012-01-171-1/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c
| * | | $IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0Rainer Gerhards2012-01-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new default turns off rate limiting. This was chosen as people experienced problems with rate-limiting activated by default. Now it needs an explicit opt-in by setting this parameter. Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to many unnamed others who already had complained at the time Chris made the suggestion ;-)
| * | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-161-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
| * | | | cosmetic: cleanup of ChangeLogRainer Gerhards2012-01-141-2/+0
| | | | |
| * | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2012-01-091-0/+2
| |\ \ \ \
| * | | | | Merge v5-stable-newstats & manual ChangeLog updateRainer Gerhards2012-01-091-0/+1
| | | | | |
* | | | | | Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-1/+5
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | preparing for 5.8.7v5.8.7Rainer Gerhards2012-01-171-1/+3
| | |_|/ / | |/| | |
| * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-161-0/+2
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: tools/syslogd.c
| | * | | FQDN hostname for multihomed host was not always set to the correct nameTomas Heinrich2012-01-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ..if multiple aliases existed. Thanks to Tomas Heinreich for the patch. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | removed imtemplate/omtemplate template modules, as this was waste of timeRainer Gerhards2012-01-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual input/output modules are better copy templates. Instead, the now-removed modules cost time for maintenance AND often caused confusion on what their role was.
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-01-091-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | final prep for 6.2.0v6.2.0Rainer Gerhards2012-01-091-1/+1
| | | | |
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-01-091-0/+7
| |\| | |
| | * | | bugfix: instabilities when using RFC5424 header fieldsKaiwang Chen2012-01-091-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | Merge branch 'beta'Rainer Gerhards2012-01-091-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html
| * | | | removing $Begin, $End, $StrictScoping directivesRainer Gerhards2012-01-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-0/+5
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * | | bugfix: stats counter were not properly initialized on creationRainer Gerhards2011-12-201-0/+1
| | | | |
| | * | | bugfix: imuxsock did truncate part of received message if it did not contain ↵Rainer Gerhards2011-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a proper date. The truncation occured because we removed that part of the messages that was expected to be the date. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=295
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-191-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c
| * | | | Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-191-1/+15
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c
| * | | | more work on queue statistics counterRainer Gerhards2011-12-161-2/+2
| | | | |
| * | | | new stats counter "discarded" for queue objectRainer Gerhards2011-12-161-0/+4
| | | | | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition.
* | | | | Merge branch 'v5-devel'Rainer Gerhards2011-12-161-1/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+3
| | | | |
| * | | | preparing for 5.9.4v5.9.4Rainer Gerhards2011-11-291-1/+1
| | | | |
| * | | | imuxsock: added capability to "annotate" messages with "trusted information",Rainer Gerhards2011-11-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd.
* | | | | Merge branch 'beta'Rainer Gerhards2011-12-161-1/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-161-1/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-161-1/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | bugfix: potential fatal abort in omgssapiTomas Heinrich2011-12-161-1/+3
| | | | |
| | | * | added doc for omprogRainer Gerhards2011-12-161-0/+1
| | | | |
* | | | | Merge branch 'beta'Rainer Gerhards2011-12-121-0/+3
|\| | | |
| * | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-12-011-0/+3
| |\| | |
| | * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-12-011-0/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c
| | | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2011-12-011-0/+3
| | | |\ \
| | | | * | bugfix: action resume interval incorrectly handled, thus took longer to resumeTomas Heinrich2011-12-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | | | * | bugfix: cosmetic: proper constant used instead of number in open callTomas Heinrich2011-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | Merge branch 'beta'Rainer Gerhards2011-10-271-1/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-271-1/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-10-271-1/+9
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | * | | bugfix: potential abort after reading invalid X.509 certificateTomas Heinrich2011-10-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | | Merge branch 'v5-stable' into betaRainer Gerhards2011-10-211-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/rsyslog_recording_pri.html